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

Fix GSO stat bug

Browse source
This commit is contained in:
winlin 2020-04-15 06:44:09 +08:00
parent 649f2042da
commit dd7b5cf53f
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -656,7 +656,7 @@ srs_error_t SrsRtcSenderThread::cycle()
// Stat the RAW RTP packets, which maybe group by GSO. // Stat the RAW RTP packets, which maybe group by GSO.
stat->perf_on_rtp_packets(pkts.packets.size()); stat->perf_on_rtp_packets(pkts.packets.size());
// Stat the RTP packets going into kernel. // Stat the RTP packets going into kernel.
stat->perf_gso_on_packets(pkts.nn_rtp_pkts); stat->perf_on_gso_packets(pkts.nn_rtp_pkts);
pprint->elapse(); pprint->elapse();
if (pprint->can_print()) { if (pprint->can_print()) {
@ -1836,7 +1836,6 @@ srs_error_t SrsUdpMuxSender::cycle()
mmsghdr* p = &hotspot[0]; mmsghdr* end = p + pos; mmsghdr* p = &hotspot[0]; mmsghdr* end = p + pos;
for (p = &hotspot[0]; p < end; p++) { for (p = &hotspot[0]; p < end; p++) {
if (!p->msg_len) { if (!p->msg_len) {
stat->perf_gso_on_packets(1);
continue; continue;
} }
@ -1845,7 +1844,6 @@ srs_error_t SrsUdpMuxSender::cycle()
p->msg_len = 0; p->msg_len = 0;
gso_pos++; nn_gso_msgs++; nn_gso_iovs += real_iovs; gso_iovs += real_iovs; gso_pos++; nn_gso_msgs++; nn_gso_iovs += real_iovs; gso_iovs += real_iovs;
stat->perf_gso_on_packets(real_iovs);
} }
} }

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

@ -619,7 +619,7 @@ srs_error_t SrsStatistic::dumps_perf_rtp_packets(SrsJsonObject* obj)
return dumps_perf(perf_rtp, obj); return dumps_perf(perf_rtp, obj);
} }
void SrsStatistic::perf_gso_on_packets(int nb_packets) void SrsStatistic::perf_on_gso_packets(int nb_packets)
{ {
perf_on_packets(perf_gso, nb_packets); perf_on_packets(perf_gso, nb_packets);
} }

2
trunk/src/app/srs_app_statistic.hpp
View file

@ -248,7 +248,7 @@ public:
public: public:
// Stat for packets UDP GSO, nb_packets is the merged RTP packets. // Stat for packets UDP GSO, nb_packets is the merged RTP packets.
// For example, three RTP/audio packets maybe GSO to one msghdr. // For example, three RTP/audio packets maybe GSO to one msghdr.
virtual void perf_gso_on_packets(int nb_packets); virtual void perf_on_gso_packets(int nb_packets);
// Dumps the perf statistic data for UDP GSO, for performance analysis. // Dumps the perf statistic data for UDP GSO, for performance analysis.
virtual srs_error_t dumps_perf_gso(SrsJsonObject* obj); virtual srs_error_t dumps_perf_gso(SrsJsonObject* obj);
public: public: