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

refine the kbps of server.

Browse source
This commit is contained in:
winlin 2015-03-08 12:55:40 +08:00
parent fbbe46d272
commit 8bf60895a9
5 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

47
trunk/src/app/srs_app_server.cpp
View file

@ -745,8 +745,12 @@ void SrsServer::remove(SrsConnection* conn)
srs_info("conn removed. conns=%d", (int)conns.size());
// resample the resource of specified connection.
resample_kbps(conn);
// resample the kbps to collect the delta.
conn->kbps_resample();
// add delta of connection to server kbps.,
// for next sample() of server kbps can get the stat.
kbps->add_delta(conn);
// all connections are created by server,
// so we free it here.
@ -862,8 +866,8 @@ int SrsServer::do_cycle()
srs_update_network_devices();
}
if ((i % SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES) == 0) {
srs_info("update network rtmp server info.");
resample_kbps(NULL);
srs_info("update network server kbps info.");
resample_kbps();
srs_update_rtmp_server((int)conns.size(), kbps);
}
#ifdef SRS_AUTO_HTTP_PARSER
@ -1013,31 +1017,24 @@ void SrsServer::close_listeners(SrsListenerType type)
}
}
void SrsServer::resample_kbps(SrsConnection* conn, bool do_resample)
void SrsServer::resample_kbps()
{
// resample all when conn is NULL.
if (!conn) {
for (std::vector<SrsConnection*>::iterator it = conns.begin(); it != conns.end(); ++it) {
SrsConnection* client = *it;
srs_assert(client);
// only resample, do resample when all finished.
resample_kbps(client, false);
}
// collect delta from all clients.
for (std::vector<SrsConnection*>::iterator it = conns.begin(); it != conns.end(); ++it) {
SrsConnection* conn = *it;
// resample the kbps to collect the delta.
conn->kbps_resample();
kbps->sample();
return;
// add delta of connection to server kbps.,
// for next sample() of server kbps can get the stat.
kbps->add_delta(conn);
}
// resample for connection.
conn->kbps_resample();
kbps->add_delta(conn);
// resample for server.
if (do_resample) {
kbps->sample();
}
// TODO: FXME: support all other connections.
// sample the kbps, get the stat.
kbps->sample();
}
int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)