From 233ff11172d329f023aebc51021694e8e64c47df Mon Sep 17 00:00:00 2001 From: tufang14 Date: Sat, 9 Jan 2016 14:58:40 +0800 Subject: [PATCH 1/2] srs reusable thread need join --- trunk/src/app/srs_app_thread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp index d9027b9c34..5f6cec84f8 100755 --- a/trunk/src/app/srs_app_thread.cpp +++ b/trunk/src/app/srs_app_thread.cpp @@ -235,7 +235,7 @@ namespace internal { // 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; + // disposed = true; handler->on_thread_stop(); srs_info("thread %s cycle finished", _name); From 56bffb66464e8d6b4d891af554d70fa4132b8117 Mon Sep 17 00:00:00 2001 From: tufang14 Date: Sat, 9 Jan 2016 15:54:23 +0800 Subject: [PATCH 2/2] Update srs_app_thread.cpp --- trunk/src/app/srs_app_thread.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp index 5f6cec84f8..92dbf63335 100755 --- a/trunk/src/app/srs_app_thread.cpp +++ b/trunk/src/app/srs_app_thread.cpp @@ -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); }