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 one cycle thread

Browse source
This commit is contained in:
winlin 2017-05-29 19:45:19 +08:00
parent b21f92f97a
commit 2ed2513f08
11 changed files with 44 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

34
trunk/src/app/srs_app_conn.cpp
View file

@ -32,23 +32,16 @@ using namespace std;
SrsConnection::SrsConnection(IConnectionManager* cm, st_netfd_t c, string cip)
{
id = 0;
manager = cm;
stfd = c;
ip = cip;
disposed = false;
expired = false;
create_time = srs_get_system_time_ms();
skt = new SrsStSocket();
kbps = new SrsKbps();
kbps->set_io(skt, skt);
// the client thread should reap itself,
// so we never use joinable.
// TODO: FIXME: maybe other thread need to stop it.
// @see: https://github.com/ossrs/srs/issues/78
pthread = new SrsOneCycleThread("conn", this);
trd = new SrsCoroutine("conn", this);
}
SrsConnection::~SrsConnection()
@ -57,7 +50,9 @@ SrsConnection::~SrsConnection()
srs_freep(kbps);
srs_freep(skt);
srs_freep(pthread);
srs_freep(trd);
srs_close_stfd(stfd);
}
void SrsConnection::resample()
@ -82,17 +77,7 @@ void SrsConnection::cleanup()
void SrsConnection::dispose()
{
if (disposed) {
return;
}
disposed = true;
/**
* when delete the connection, stop the connection,
* close the underlayer socket, delete the thread.
*/
srs_close_stfd(stfd);
trd->interrupt();
}
int SrsConnection::start()
@ -103,16 +88,13 @@ int SrsConnection::start()
return ret;
}
return pthread->start();
return trd->start();
}
int SrsConnection::cycle()
{
int ret = ERROR_SUCCESS;
_srs_context->generate_id();
id = _srs_context->get_id();
int oret = ret = do_cycle();
// if socket io error, set to closed.
@ -138,12 +120,12 @@ int SrsConnection::cycle()
int SrsConnection::srs_id()
{
return id;
return trd->cid();
}
void SrsConnection::expire()
{
expired = true;
trd->interrupt();
}