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

STAT: Update stat for SRT connection.

Browse source
This commit is contained in:
winlin 2022-08-27 18:49:57 +08:00
parent 101e4fa3b9
commit da24de5ecb
5 changed files with 104 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

65
trunk/src/app/srs_app_srt_server.cpp
View file

@ -13,6 +13,7 @@ using namespace std;
#include <srs_protocol_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_srt_conn.hpp>
#include <srs_app_statistic.hpp>
#ifdef SRS_SRT
SrsSrtEventLoop* _srt_eventloop = NULL;
@ -131,16 +132,27 @@ srs_error_t SrsSrtAcceptor::on_srt_client(srs_srt_t srt_fd)
SrsSrtServer::SrsSrtServer()
{
conn_manager_ = new SrsResourceManager("SRT", true);
timer_ = NULL;
}
SrsSrtServer::~SrsSrtServer()
{
srs_freep(conn_manager_);
srs_freep(timer_);
}
srs_error_t SrsSrtServer::initialize()
{
srs_error_t err = srs_success;
if (! _srs_config->get_srt_enabled()) {
return err;
}
if ((err = setup_ticks()) != srs_success) {
return srs_error_wrap(err, "tick");
}
return err;
}
@ -242,17 +254,54 @@ srs_error_t SrsSrtServer::fd_to_resource(srs_srt_t srt_fd, ISrsStartableConnecit
void SrsSrtServer::remove(ISrsResource* c)
{
// TODO: FIXME: add some statistic of srt.
// ISrsStartableConneciton* conn = dynamic_cast<ISrsStartableConneciton*>(c);
// SrsStatistic* stat = SrsStatistic::instance();
// stat->kbps_add_delta(c->get_id().c_str(), conn);
// stat->on_disconnect(c->get_id().c_str());
// use manager to free it async.
conn_manager_->remove(c);
}
srs_error_t SrsSrtServer::setup_ticks()
{
srs_error_t err = srs_success;
srs_freep(timer_);
timer_ = new SrsHourGlass("srt", this, 1 * SRS_UTIME_SECONDS);
if (_srs_config->get_stats_enabled()) {
if ((err = timer_->tick(8, 3 * SRS_UTIME_SECONDS)) != srs_success) {
return srs_error_wrap(err, "tick");
}
}
if ((err = timer_->start()) != srs_success) {
return srs_error_wrap(err, "timer");
}
return err;
}
srs_error_t SrsSrtServer::notify(int event, srs_utime_t interval, srs_utime_t tick)
{
srs_error_t err = srs_success;
switch (event) {
case 8: resample_kbps(); break;
}
return err;
}
void SrsSrtServer::resample_kbps()
{
// collect delta from all clients.
for (int i = 0; i < (int)conn_manager_->size(); i++) {
ISrsResource* c = conn_manager_->at(i);
ISrsKbpsDelta* conn = dynamic_cast<ISrsKbpsDelta*>(conn_manager_->at(i));
// add delta of connection to server kbps.,
// for next sample() of server kbps can get the stat.
SrsStatistic::instance()->kbps_add_delta(c->get_id().c_str(), conn);
}
}
SrsSrtServerAdapter::SrsSrtServerAdapter()
{
srt_server_ = new SrsSrtServer();
@ -349,7 +398,7 @@ srs_error_t SrsSrtEventLoop::start()
srs_error_t SrsSrtEventLoop::cycle()
{
srs_error_t err = srs_success;
while (true) {
if ((err = trd_->pull()) != srs_success) {
return srs_error_wrap(err, "srt listener");