external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Create isolate pithy printer for each RTC FD

Browse source
This commit is contained in:
winlin 2020-04-13 09:32:48 +08:00
parent 087559813f
commit 216b3bf414
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_listener.cpp
View file

@ -444,7 +444,7 @@ srs_error_t SrsUdpMuxListener::cycle()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_recv(); SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_recv(srs_netfd_fileno(lfd));
SrsAutoFree(SrsPithyPrint, pprint); SrsAutoFree(SrsPithyPrint, pprint);
uint64_t nn_msgs = 0; uint64_t nn_msgs = 0;

8
trunk/src/app/srs_app_pithy_print.cpp
View file

@ -177,14 +177,14 @@ SrsPithyPrint* SrsPithyPrint::create_rtc_play()
return new SrsPithyPrint(SRS_CONSTS_STAGE_RTC_PLAY); return new SrsPithyPrint(SRS_CONSTS_STAGE_RTC_PLAY);
} }
SrsPithyPrint* SrsPithyPrint::create_rtc_send() SrsPithyPrint* SrsPithyPrint::create_rtc_send(int fd)
{ {
return new SrsPithyPrint(SRS_CONSTS_STAGE_RTC_SEND); return new SrsPithyPrint(fd<<16 | SRS_CONSTS_STAGE_RTC_SEND);
} }
SrsPithyPrint* SrsPithyPrint::create_rtc_recv() SrsPithyPrint* SrsPithyPrint::create_rtc_recv(int fd)
{ {
return new SrsPithyPrint(SRS_CONSTS_STAGE_RTC_RECV); return new SrsPithyPrint(fd<<16 | SRS_CONSTS_STAGE_RTC_RECV);
} }
SrsPithyPrint::~SrsPithyPrint() SrsPithyPrint::~SrsPithyPrint()

5
trunk/src/app/srs_app_pithy_print.hpp
View file

@ -88,8 +88,9 @@ public:
static SrsPithyPrint* create_http_stream(); static SrsPithyPrint* create_http_stream();
static SrsPithyPrint* create_http_stream_cache(); static SrsPithyPrint* create_http_stream_cache();
static SrsPithyPrint* create_rtc_play(); static SrsPithyPrint* create_rtc_play();
static SrsPithyPrint* create_rtc_send(); // For RTC sender and receiver, we create printer for each fd.
static SrsPithyPrint* create_rtc_recv(); static SrsPithyPrint* create_rtc_send(int fd);
static SrsPithyPrint* create_rtc_recv(int fd);
virtual ~SrsPithyPrint(); virtual ~SrsPithyPrint();
private: private:
// Enter the specified stage, return the client id. // Enter the specified stage, return the client id.

2
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -1439,7 +1439,7 @@ srs_error_t SrsUdpMuxSender::cycle()
srs_utime_t time_last = srs_get_system_time(); srs_utime_t time_last = srs_get_system_time();
SrsStatistic* stat = SrsStatistic::instance(); SrsStatistic* stat = SrsStatistic::instance();
SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_send(); SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_send(srs_netfd_fileno(lfd));
SrsAutoFree(SrsPithyPrint, pprint); SrsAutoFree(SrsPithyPrint, pprint);
while (true) { while (true) {