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 bug #237, add name for thread. 2.0.47

Browse source
This commit is contained in:
winlin 2014-12-03 14:05:15 +08:00
parent c083238760
commit c457364321
9 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
trunk/src/app/srs_app_thread.cpp
View file

@ -54,8 +54,9 @@ void ISrsThreadHandler::on_thread_stop()
{
}
SrsThread::SrsThread(ISrsThreadHandler* thread_handler, int64_t interval_us, bool joinable)
SrsThread::SrsThread(const char* name, ISrsThreadHandler* thread_handler, int64_t interval_us, bool joinable)
{
_name = name;
handler = thread_handler;
cycle_interval_us = interval_us;
@ -86,7 +87,7 @@ int SrsThread::start()
int ret = ERROR_SUCCESS;
if(tid) {
srs_info("thread already running.");
srs_info("thread %s already running.", _name);
return ret;
}
@ -141,7 +142,7 @@ void SrsThread::thread_cycle()
int ret = ERROR_SUCCESS;
_srs_context->generate_id();
srs_info("thread cycle start");
srs_info("thread %s cycle start", _name);
_cid = _srs_context->get_id();
@ -155,24 +156,24 @@ void SrsThread::thread_cycle()
while (loop) {
if ((ret = handler->on_before_cycle()) != ERROR_SUCCESS) {
srs_warn("thread on before cycle failed, ignored and retry, ret=%d", ret);
srs_warn("thread %s on before cycle failed, ignored and retry, ret=%d", _name, ret);
goto failed;
}
srs_info("thread on before cycle success");
srs_info("thread %s on before cycle success");
if ((ret = handler->cycle()) != ERROR_SUCCESS) {
if (!srs_is_client_gracefully_close(ret)) {
srs_warn("thread cycle failed, ignored and retry, ret=%d", ret);
srs_warn("thread cycle failed, ignored and retry, ret=%d", _name, ret);
}
goto failed;
}
srs_info("thread cycle success");
srs_info("thread %s cycle success", _name);
if ((ret = handler->on_end_cycle()) != ERROR_SUCCESS) {
srs_warn("thread on end cycle failed, ignored and retry, ret=%d", ret);
srs_warn("thread %s on end cycle failed, ignored and retry, ret=%d", _name, ret);
goto failed;
}
srs_info("thread on end cycle success");
srs_info("thread %s on end cycle success", _name);
failed:
if (!loop) {
@ -187,7 +188,7 @@ failed:
}
handler->on_thread_stop();
srs_info("thread cycle finished");
srs_info("thread %s cycle finished", _name);
}
void* SrsThread::thread_fun(void* arg)