Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

srs reusable thread need join #559

Merged
merged 2 commits into from
Jan 9, 2016
Merged

srs reusable thread need join #559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
233ff11
srs reusable thread need join
Jan 9, 2016
56bffb6
Update srs_app_thread.cpp
Jan 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions trunk/src/app/srs_app_thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,6 @@ namespace internal {
// readly terminated now.
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();
srs_info("thread %s cycle finished", _name);
}
Expand Down