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

Cover more ST Coroutine code

Browse source
This commit is contained in:
winlin 2019-04-07 14:35:11 +08:00
parent 3d5508e088
commit 1ce040cc2c
3 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@ SrsSTCoroutine::SrsSTCoroutine(const string& n, ISrsCoroutineHandler* h, int cid
context = cid;
trd = NULL;
trd_err = srs_success;
started = interrupted = disposed = false;
started = interrupted = disposed = cycle_done = false;
}
SrsSTCoroutine::~SrsSTCoroutine()
@ -153,8 +153,8 @@ void SrsSTCoroutine::stop()
return;
}
// If there's no error occur from worker, try to set to interrupted error.
if (trd_err == srs_success) {
// If there's no error occur from worker, try to set to terminated error.
if (trd_err == srs_success && !cycle_done) {
trd_err = srs_error_new(ERROR_THREAD_TERMINATED, "terminated");
}
@ -163,7 +163,7 @@ void SrsSTCoroutine::stop()
void SrsSTCoroutine::interrupt()
{
if (!started || interrupted) {
if (!started || interrupted || cycle_done) {
return;
}
interrupted = true;
@ -199,6 +199,9 @@ srs_error_t SrsSTCoroutine::cycle()
if (err != srs_success) {
return srs_error_wrap(err, "coroutine cycle");
}
// Set cycle done, no need to interrupt it.
cycle_done = true;
return err;
}