Support thread pool and update ossrs.net. v5.0.33

ossrs · Jun 29, 2022 · 0badae4 · 0badae4
1 parent 57be518
commit 0badae4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -348,9 +348,9 @@ jobs:
       - name: Build variables for lh.ossrs.net
         run: |
           SRS_LH_OSSRS_NET=$(dig +short lh.ossrs.net)
-          SRS_R_OSSRS_NET=$(dig +short r.ossrs.net)
+          SRS_D_OSSRS_NET=$(dig +short d.ossrs.net)
           echo "SRS_LH_OSSRS_NET=$SRS_LH_OSSRS_NET" >> $GITHUB_ENV
-          echo "SRS_R_OSSRS_NET=$SRS_R_OSSRS_NET" >> $GITHUB_ENV
+          echo "SRS_D_OSSRS_NET=$SRS_D_OSSRS_NET" >> $GITHUB_ENV
 
       - name: Release to lh.ossrs.net
         uses: appleboy/ssh-action@master
@@ -372,10 +372,10 @@ jobs:
               echo "Remove image $image, r0=$?"
             done
 
-      - name: Release to r.ossrs.net
+      - name: Release to d.ossrs.net
         uses: appleboy/ssh-action@master
         with:
-          host: ${{ env.SRS_R_OSSRS_NET }}
+          host: ${{ env.SRS_D_OSSRS_NET }}
           username: root
           key: ${{ secrets.DIGITALOCEAN_SSHKEY }}
           port: 22

diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp
@@ -34,11 +34,11 @@ using namespace std;
 #include <fcntl.h>
 
 #ifdef SRS_OSX
-pid_t gettid() {
-    return 0;
-}
+    pid_t gettid() {
+        return 0;
+    }
 #else
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+    #if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
         #include <sys/syscall.h>
         #define gettid() syscall(SYS_gettid)
     #endif

diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       5
 #define VERSION_MINOR       0
-#define VERSION_REVISION    32
+#define VERSION_REVISION    33
 
 #endif