Merge pull request #559 from tufang14/2.0release
srs reusable thread need join
正在显示
1 个修改的文件
包含
0 行增加
和
5 行删除
| @@ -232,11 +232,6 @@ namespace internal { | @@ -232,11 +232,6 @@ namespace internal { | ||
| 232 | // readly terminated now. | 232 | // readly terminated now. |
| 233 | really_terminated = true; | 233 | really_terminated = true; |
| 234 | 234 | ||
| 235 | - // when thread terminated normally, also disposed. | ||
| 236 | - // we must set to disposed before the on_thread_stop, which may free the thread. | ||
| 237 | - // @see https://github.com/ossrs/srs/issues/546 | ||
| 238 | - disposed = true; | ||
| 239 | - | ||
| 240 | handler->on_thread_stop(); | 235 | handler->on_thread_stop(); |
| 241 | srs_info("thread %s cycle finished", _name); | 236 | srs_info("thread %s cycle finished", _name); |
| 242 | } | 237 | } |
-
请 注册 或 登录 后发表评论