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, use coroutine for reusable2 thread

Browse source
This commit is contained in:
winlin 2017-05-29 20:49:29 +08:00
parent ea9a5f26d9
commit 6993ac226f
12 changed files with 115 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

36
trunk/src/app/srs_app_forward.cpp
View file

@ -47,9 +47,6 @@ using namespace std;
#include <srs_kernel_utility.hpp>
#include <srs_app_rtmp_conn.hpp>
// when error, forwarder sleep for a while and retry.
#define SRS_FORWARDER_CIMS (3000)
SrsForwarder::SrsForwarder(SrsOriginHub* h)
{
hub = h;
@ -58,7 +55,7 @@ SrsForwarder::SrsForwarder(SrsOriginHub* h)
sh_video = sh_audio = NULL;
sdk = NULL;
pthread = new SrsReusableThread2("forward", this, SRS_FORWARDER_CIMS);
trd = NULL;
queue = new SrsMessageQueue();
jitter = new SrsRtmpJitter();
}
@ -66,7 +63,7 @@ SrsForwarder::SrsForwarder(SrsOriginHub* h)
SrsForwarder::~SrsForwarder()
{
srs_freep(sdk);
srs_freep(pthread);
srs_freep(trd);
srs_freep(queue);
srs_freep(jitter);
@ -138,18 +135,19 @@ int SrsForwarder::on_publish()
source_ep.c_str(), dest_ep.c_str(), tcUrl.c_str(),
req->stream.c_str());
if ((ret = pthread->start()) != ERROR_SUCCESS) {
srs_freep(trd);
trd = new SrsCoroutine("forward", this);
if ((ret = trd->start()) != ERROR_SUCCESS) {
srs_error("start srs thread failed. ret=%d", ret);
return ret;
}
srs_trace("forward thread cid=%d, current_cid=%d", pthread->cid(), _srs_context->get_id());
return ret;
}
void SrsForwarder::on_unpublish()
{
pthread->stop();
trd->stop();
sdk->close();
}
@ -220,10 +218,30 @@ int SrsForwarder::on_video(SrsSharedPtrMessage* shared_video)
return ret;
}
// when error, forwarder sleep for a while and retry.
#define SRS_FORWARDER_CIMS (3000)
int SrsForwarder::cycle()
{
int ret = ERROR_SUCCESS;
while (!trd->pull()) {
if ((ret = do_cycle()) != ERROR_SUCCESS) {
srs_warn("Forwarder: Ignore error, ret=%d", ret);
}
if (!trd->pull()) {
st_usleep(SRS_FORWARDER_CIMS * 1000);
}
}
return ret;
}
int SrsForwarder::do_cycle()
{
int ret = ERROR_SUCCESS;
std::string url;
if (true) {
std::string server;
@ -289,7 +307,7 @@ int SrsForwarder::forward()
}
}
while (!pthread->interrupted()) {
while (!trd->pull()) {
pprint->elapse();
// read from client.