@@ -1692,7 +1692,7 @@ int CUDTGroup::sendBroadcast(const char* buf, int len, SRT_MSGCTRL& w_mc)
1692 1692
}
1693 1693 1694 1694
// Now that at least one link has succeeded, update sending stats.
1695 -
m_stats.sent.Update(len);
1695 +
m_stats.sent.count(len);
1696 1696 1697 1697
// Pity that the blocking mode only determines as to whether this function should
1698 1698
// block or not, but the epoll flags must be updated regardless of the mode.
@@ -2259,7 +2259,7 @@ int CUDTGroup::recv(char* buf, int len, SRT_MSGCTRL& w_mc)
2259 2259
pos->packet.clear();
2260 2260 2261 2261
// Update stats as per delivery
2262 -
m_stats.recv.Update(len);
2262 +
m_stats.recv.count(len);
2263 2263
updateAvgPayloadSize(len);
2264 2264 2265 2265
// We predict to have only one packet ahead, others are pending to be reported by tsbpd.
@@ -2491,7 +2491,7 @@ int CUDTGroup::recv(char* buf, int len, SRT_MSGCTRL& w_mc)
2491 2491
log << "group/recv: @" << id << " %" << mctrl.pktseq << " #" << mctrl.msgno
2492 2492
<< " BEHIND base=%" << m_RcvBaseSeqNo << " - discarding");
2493 2493
// The sequence is recorded, the packet has to be discarded.
2494 -
m_stats.recvDiscard.Update(stat);
2494 +
m_stats.recvDiscard.count(stat);
2495 2495
continue;
2496 2496
}
2497 2497
@@ -2527,7 +2527,7 @@ int CUDTGroup::recv(char* buf, int len, SRT_MSGCTRL& w_mc)
2527 2527
fillGroupData((w_mc), mctrl);
2528 2528 2529 2529
// Update stats as per delivery
2530 -
m_stats.recv.Update(output_size);
2530 +
m_stats.recv.count(output_size);
2531 2531
updateAvgPayloadSize(output_size);
2532 2532 2533 2533
// Record, but do not update yet, until all sockets are handled.
@@ -2681,7 +2681,7 @@ int CUDTGroup::recv(char* buf, int len, SRT_MSGCTRL& w_mc)
2681 2681
const int32_t jump = (CSeqNo(slowest_kangaroo->second.mctrl.pktseq) - CSeqNo(m_RcvBaseSeqNo)) - 1;
2682 2682
if (jump > 0)
2683 2683
{
2684 -
m_stats.recvDrop.UpdateTimes(jump, avgRcvPacketSize());
2684 +
m_stats.recvDrop.count(stats::BytesPackets(jump * static_cast<uint64_t>(avgRcvPacketSize()), jump));
2685 2685
LOGC(grlog.Warn,
2686 2686
log << "@" << m_GroupID << " GROUP RCV-DROPPED " << jump << " packet(s): seqno %"
2687 2687
<< m_RcvBaseSeqNo << " to %" << slowest_kangaroo->second.mctrl.pktseq);
@@ -2703,7 +2703,7 @@ int CUDTGroup::recv(char* buf, int len, SRT_MSGCTRL& w_mc)
2703 2703
pkt.clear();
2704 2704 2705 2705
// Update stats as per delivery
2706 -
m_stats.recv.Update(len);
2706 +
m_stats.recv.count(len);
2707 2707
updateAvgPayloadSize(len);
2708 2708 2709 2709
// It is unlikely to have a packet ahead because usually having one packet jumped-ahead
@@ -2830,21 +2830,21 @@ void CUDTGroup::bstatsSocket(CBytePerfMon* perf, bool clear)
2830 2830 2831 2831
perf->msTimeStamp = count_milliseconds(currtime - m_tsStartTime);
2832 2832 2833 -
perf->pktSentUnique = m_stats.sent.local.pkts;
2834 -
perf->pktRecvUnique = m_stats.recv.local.pkts;
2835 -
perf->pktRcvDrop = m_stats.recvDrop.local.pkts;
2833 +
perf->pktSentUnique = m_stats.sent.trace.count();
2834 +
perf->pktRecvUnique = m_stats.recv.trace.count();
2835 +
perf->pktRcvDrop = m_stats.recvDrop.trace.count();
2836 2836 2837 -
perf->byteSentUnique = m_stats.sent.local.fullBytes();
2838 -
perf->byteRecvUnique = m_stats.recv.local.fullBytes();
2839 -
perf->byteRcvDrop = m_stats.recvDrop.local.fullBytes();
2837 +
perf->byteSentUnique = m_stats.sent.trace.bytesWithHdr();
2838 +
perf->byteRecvUnique = m_stats.recv.trace.bytesWithHdr();
2839 +
perf->byteRcvDrop = m_stats.recvDrop.trace.bytesWithHdr();
2840 2840 2841 -
perf->pktSentUniqueTotal = m_stats.sent.total.pkts;
2842 -
perf->pktRecvUniqueTotal = m_stats.recv.total.pkts;
2843 -
perf->pktRcvDropTotal = m_stats.recvDrop.total.pkts;
2841 +
perf->pktSentUniqueTotal = m_stats.sent.total.count();
2842 +
perf->pktRecvUniqueTotal = m_stats.recv.total.count();
2843 +
perf->pktRcvDropTotal = m_stats.recvDrop.total.count();
2844 2844 2845 -
perf->byteSentUniqueTotal = m_stats.sent.total.fullBytes();
2846 -
perf->byteRecvUniqueTotal = m_stats.recv.total.fullBytes();
2847 -
perf->byteRcvDropTotal = m_stats.recvDrop.total.fullBytes();
2845 +
perf->byteSentUniqueTotal = m_stats.sent.total.bytesWithHdr();
2846 +
perf->byteRecvUniqueTotal = m_stats.recv.total.bytesWithHdr();
2847 +
perf->byteRcvDropTotal = m_stats.recvDrop.total.bytesWithHdr();
2848 2848 2849 2849
const double interval = static_cast<double>(count_microseconds(currtime - m_stats.tsLastSampleTime));
2850 2850
perf->mbpsSendRate = double(perf->byteSent) * 8.0 / interval;
@@ -3165,7 +3165,7 @@ CUDTGroup::BackupMemberState CUDTGroup::sendBackup_QualifyActiveState(const gli_
3165 3165
}
3166 3166 3167 3167
enterCS(u.m_StatsLock);
3168 -
const int64_t drop_total = u.m_stats.sndDropTotal;
3168 +
const int64_t drop_total = u.m_stats.sndr.dropped.total.count();
3169 3169
leaveCS(u.m_StatsLock);
3170 3170 3171 3171
const bool have_new_drops = d->pktSndDropTotal != drop_total;
@@ -4039,7 +4039,7 @@ int CUDTGroup::sendBackup(const char* buf, int len, SRT_MSGCTRL& w_mc)
4039 4039
}
4040 4040 4041 4041
// At least one link has succeeded, update sending stats.
4042 -
m_stats.sent.Update(len);
4042 +
m_stats.sent.count(len);
4043 4043 4044 4044
// Now fill in the socket table. Check if the size is enough, if not,
4045 4045
// then set the pointer to NULL and set the correct size.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4