the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
正在显示
3 个修改的文件
包含
5 行增加
和
2 行删除
@@ -388,6 +388,7 @@ Supported operating systems and hardware: | @@ -388,6 +388,7 @@ Supported operating systems and hardware: | ||
388 | 388 | ||
389 | ## History | 389 | ## History |
390 | 390 | ||
391 | +* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. | ||
391 | * <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong> | 392 | * <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong> |
392 | * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. | 393 | * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. |
393 | * v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26 | 394 | * v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26 |
@@ -120,7 +120,9 @@ void SrsThread::stop() | @@ -120,7 +120,9 @@ void SrsThread::stop() | ||
120 | st_thread_interrupt(tid); | 120 | st_thread_interrupt(tid); |
121 | 121 | ||
122 | // wait the thread to exit. | 122 | // wait the thread to exit. |
123 | - st_thread_join(tid, NULL); | 123 | + int ret = st_thread_join(tid, NULL); |
124 | + // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated. | ||
125 | + srs_assert(ret == 0); | ||
124 | 126 | ||
125 | tid = NULL; | 127 | tid = NULL; |
126 | } | 128 | } |
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
31 | // current release version | 31 | // current release version |
32 | #define VERSION_MAJOR 1 | 32 | #define VERSION_MAJOR 1 |
33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
34 | -#define VERSION_REVISION 27 | 34 | +#define VERSION_REVISION 28 |
35 | 35 | ||
36 | // server info. | 36 | // server info. |
37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
-
请 注册 或 登录 后发表评论