1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Merge pull request #559 from tufang14/2.0release

srs reusable thread need join
This commit is contained in:
winlin 2016-01-09 16:00:58 +08:00
commit da722b5b5d

View file

@ -232,11 +232,6 @@ namespace internal {
// readly terminated now. // readly terminated now.
really_terminated = true; really_terminated = true;
// when thread terminated normally, also disposed.
// we must set to disposed before the on_thread_stop, which may free the thread.
// @see https://github.com/ossrs/srs/issues/546
disposed = true;
handler->on_thread_stop(); handler->on_thread_stop();
srs_info("thread %s cycle finished", _name); srs_info("thread %s cycle finished", _name);
} }