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

For #906, #902, replace the endless thread with coroutine

Browse source
This commit is contained in:
winlin 2017-05-29 17:56:26 +08:00
parent fc380fe48d
commit 44f542f77f
7 changed files with 28 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_st.cpp
View file

@ -87,7 +87,7 @@ void SrsCoroutine::stop()
void* res = NULL;
int ret = st_thread_join(trd, &res);
srs_trace("Thread.stop: Terminated, ret=%d, err=%d", ret, err);
srs_info("Thread.stop: Terminated, ret=%d, err=%d", ret, err);
srs_assert(!ret);
// Always override the error by the worker.
@ -107,7 +107,7 @@ void SrsCoroutine::interrupt()
}
interrupted = true;
srs_trace("Thread.interrupt: Interrupt thread, err=%d", err);
srs_info("Thread.interrupt: Interrupt thread, err=%d", err);
err = (err == ERROR_SUCCESS? ERROR_THREAD_INTERRUPED:err);
st_thread_interrupt(trd);
}
@ -127,10 +127,10 @@ int SrsCoroutine::cycle()
if (!context && _srs_context) {
context = _srs_context->generate_id();
}
srs_trace("Thread.cycle: Start with cid=%d, err=%d", context, err);
srs_info("Thread.cycle: Start with cid=%d, err=%d", context, err);
int ret = handler->cycle();
srs_trace("Thread.cycle: Finished with ret=%d, err=%d", ret, err);
srs_info("Thread.cycle: Finished with ret=%d, err=%d", ret, err);
return ret;
}