Skip to content

Commit

Permalink
Support thread pool and update ossrs.net. v5.0.33
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Jun 29, 2022
1 parent 57be518 commit 0badae4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions trunk/src/app/srs_app_threads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version5.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 5
#define VERSION_MINOR 0
#define VERSION_REVISION 32
#define VERSION_REVISION 33

#endif

0 comments on commit 0badae4

Please sign in to comment.