From 93242918ad78d0f61115abd8899e96cea7b5746e Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 15 Nov 2021 11:10:39 +0800 Subject: [PATCH] Squash: For #1708 --- .github/workflows/release.yml | 5 +++-- README.md | 1 + trunk/doc/CHANGELOG.md | 2 ++ trunk/src/app/srs_app_st.cpp | 10 ++++++++++ trunk/src/app/srs_app_st.hpp | 4 ++++ trunk/src/core/srs_core_version4.hpp | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbfbd27d2c..252606bdda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,8 +130,9 @@ jobs: release_name: Release ${{ github.ref }} body: | ${{ github.event.head_commit.message }} - ${{ env.SRS_SOURCE_MD5 }} [${{ env.SRS_SOURCE_TAR }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_SOURCE_TAR }}) - ${{ env.SRS_PACKAGE_MD5 }} [${{ env.SRS_PACKAGE_ZIP }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_PACKAGE_ZIP }}) + ## Resource + * Source: ${{ env.SRS_SOURCE_MD5 }} [${{ env.SRS_SOURCE_TAR }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_SOURCE_TAR }}) + * Binary: ${{ env.SRS_PACKAGE_MD5 }} [${{ env.SRS_PACKAGE_ZIP }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_PACKAGE_ZIP }}) draft: false prerelease: true # Upload release source files diff --git a/README.md b/README.md index 2f41a97d8d..701576ee2f 100755 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ A big `THANK YOU` also goes to: ## Releases +* 2021-11-15, Release [v4.0.198](https://github.com/ossrs/srs/releases/tag/v4.0.198), 4.0 dev8, v4.0.198, 144010 lines. * 2021-11-02, Release [v4.0.191](https://github.com/ossrs/srs/releases/tag/v4.0.191), 4.0 dev7, v4.0.191, 143890 lines. * 2021-10-12, Release [v4.0.177](https://github.com/ossrs/srs/releases/tag/v4.0.177), 4.0 dev6, v4.0.177, 143686 lines. * 2021-09-05, Release [v4.0.161](https://github.com/ossrs/srs/releases/tag/v4.0.161), 4.0 dev5, v4.0.161, 145865 lines. diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 1d51b29942..29eafdd4b0 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -30,6 +30,8 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-11-15, For [#1708](https://github.com/ossrs/srs/pull/1708): ST: Print log when multiple thread stop one coroutine. (#1708). v4.0.198 +* v4.0, 2021-11-14, Merge [#2732](https://github.com/ossrs/srs/pull/2732): WebRTC: Fail to publish RTC automatically for HTML5. (#2732). v4.0.197 * v4.0, 2021-11-13, Merge [#2729](https://github.com/ossrs/srs/pull/2729): RTC: check audio track exist when negotiate (#2729). v4.0.196 * v4.0, 2021-11-09, Merge [#2721](https://github.com/ossrs/srs/pull/2721): Rtc2Rtmp: Use RTP timestamp to identify video frames. v4.0.195 * v4.0, 2021-11-07, Merge [#2711](https://github.com/ossrs/srs/pull/2711): Config: Guess config files by [FHS](https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard). v4.0.194 diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp index 3d8223c486..4348353b44 100755 --- a/trunk/src/app/srs_app_st.cpp +++ b/trunk/src/app/srs_app_st.cpp @@ -125,6 +125,7 @@ SrsFastCoroutine::SrsFastCoroutine(string n, ISrsCoroutineHandler* h) trd = NULL; trd_err = srs_success; started = interrupted = disposed = cycle_done = false; + stopping_ = false; // 0 use default, default is 64K. stack_size = 0; @@ -138,6 +139,7 @@ SrsFastCoroutine::SrsFastCoroutine(string n, ISrsCoroutineHandler* h, SrsContext trd = NULL; trd_err = srs_success; started = interrupted = disposed = cycle_done = false; + stopping_ = false; // 0 use default, default is 64K. stack_size = 0; @@ -192,9 +194,14 @@ srs_error_t SrsFastCoroutine::start() void SrsFastCoroutine::stop() { if (disposed) { + if (stopping_) { + srs_error("thread is stopping by %s", stopping_cid_.c_str()); + srs_assert(!stopping_); + } return; } disposed = true; + stopping_ = true; interrupt(); @@ -225,6 +232,9 @@ void SrsFastCoroutine::stop() if (trd_err == srs_success && !cycle_done) { trd_err = srs_error_new(ERROR_THREAD_TERMINATED, "terminated"); } + + // Now, we'are stopped. + stopping_ = false; return; } diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp index a5894b8ea0..924e782536 100644 --- a/trunk/src/app/srs_app_st.hpp +++ b/trunk/src/app/srs_app_st.hpp @@ -163,6 +163,10 @@ class SrsFastCoroutine bool disposed; // Cycle done, no need to interrupt it. bool cycle_done; +private: + // Sub state in disposed, we need to wait for thread to quit. + bool stopping_; + SrsContextId stopping_cid_; public: SrsFastCoroutine(std::string n, ISrsCoroutineHandler* h); SrsFastCoroutine(std::string n, ISrsCoroutineHandler* h, SrsContextId cid); diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 5c9c915bcd..22134fcde1 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 196 +#define VERSION_REVISION 198 #endif