diff --git a/xtransmit/srt_socket.cpp b/xtransmit/srt_socket.cpp index 51049c5..bd50b59 100644 --- a/xtransmit/srt_socket.cpp +++ b/xtransmit/srt_socket.cpp @@ -575,16 +575,20 @@ const string socket::srt::stats_to_csv(int socketid, const SRT_TRACEBSTATS& stat #ifdef HAS_PUT_TIME output << "Timepoint,"; #endif - output << "Time,SocketID,pktFlowWindow,pktCongestionWindow,pktFlightSize,"; - output << "msRTT,mbpsBandwidth,mbpsMaxBW,pktSent,pktSndLoss,pktSndDrop,"; - output << "pktRetrans,byteSent,byteAvailSndBuf,byteSndDrop,mbpsSendRate,usPktSndPeriod,msSndBuf,"; - output << "pktRecv,pktRcvLoss,pktRcvDrop,pktRcvUndecrypt,pktRcvRetrans,pktRcvBelated,"; + output << "Time,SocketID,weight,pktFlowWindow,pktCongestionWindow,pktFlightSize,"; + output << "msRTT,mbpsBandwidth,mbpsMaxBW,pktSent,"; +#if HAS_UNIQUE_PKTS + output << "pktSentUnique,"; +#endif + output << "pktSndLoss,pktSndDrop,pktRetrans,byteSent,"; + output << "byteAvailSndBuf,byteSndDrop,mbpsSendRate,usPktSndPeriod,msSndBuf,pktRecv,"; +#if HAS_UNIQUE_PKTS + output << "pktRecvUnique,"; +#endif + output << "pktRcvLoss,pktRcvDrop,pktRcvUndecrypt,pktRcvRetrans,pktRcvBelated,"; output << "byteRecv,byteAvailRcvBuf,byteRcvLoss,byteRcvDrop,mbpsRecvRate,msRcvBuf,msRcvTsbPdDelay"; #if HAS_PKT_REORDER_TOL output << ",pktReorderTolerance"; -#endif -#if HAS_UNIQUE_PKTS - output << ",pktSentUnique,pktRecvUnique"; #endif output << endl; return output.str(); @@ -596,6 +600,7 @@ const string socket::srt::stats_to_csv(int socketid, const SRT_TRACEBSTATS& stat output << stats.msTimeStamp << ','; output << socketid << ','; + output << 0 << ','; // weight output << stats.pktFlowWindow << ','; output << stats.pktCongestionWindow << ','; output << stats.pktFlightSize << ','; @@ -604,6 +609,9 @@ const string socket::srt::stats_to_csv(int socketid, const SRT_TRACEBSTATS& stat output << stats.mbpsBandwidth << ','; output << stats.mbpsMaxBW << ','; output << stats.pktSent << ','; +#if HAS_UNIQUE_PKTS + output << stats.pktSentUnique << ","; +#endif output << stats.pktSndLoss << ','; output << stats.pktSndDrop << ','; @@ -616,6 +624,9 @@ const string socket::srt::stats_to_csv(int socketid, const SRT_TRACEBSTATS& stat output << stats.msSndBuf << ','; output << stats.pktRecv << ','; +#if HAS_UNIQUE_PKTS + output << stats.pktRecvUnique << ","; +#endif output << stats.pktRcvLoss << ','; output << stats.pktRcvDrop << ','; output << stats.pktRcvUndecrypt << ","; @@ -634,11 +645,6 @@ const string socket::srt::stats_to_csv(int socketid, const SRT_TRACEBSTATS& stat output << "," << stats.pktReorderTolerance; #endif -#if HAS_UNIQUE_PKTS - output << "," << stats.pktSentUnique; - output << "," << stats.pktRecvUnique; -#endif - output << endl; return output.str(); diff --git a/xtransmit/srt_socket_group.cpp b/xtransmit/srt_socket_group.cpp index 932e858..ddca1bb 100644 --- a/xtransmit/srt_socket_group.cpp +++ b/xtransmit/srt_socket_group.cpp @@ -752,7 +752,7 @@ const string socket::srt_group::stats_to_csv(int socketid, const SRT_TRACEBSTATS #if HAS_UNIQUE_PKTS output << "pktRecvUnique,"; #endif - output << "pktRcvLoss,pktRcvDrop,pktRcvRetrans,pktRcvBelated,"; + output << "pktRcvLoss,pktRcvDrop,pktRcvUndecrypt,pktRcvRetrans,pktRcvBelated,"; output << "byteRecv,byteAvailRcvBuf,byteRcvLoss,byteRcvDrop,mbpsRecvRate,msRcvBuf,msRcvTsbPdDelay"; #if HAS_PKT_REORDER_TOL output << ",pktReorderTolerance"; @@ -796,6 +796,7 @@ const string socket::srt_group::stats_to_csv(int socketid, const SRT_TRACEBSTATS #endif output << stats.pktRcvLoss << ','; output << stats.pktRcvDrop << ','; + output << stats.pktRcvUndecrypt << ","; output << stats.pktRcvRetrans << ','; output << stats.pktRcvBelated << ','; @@ -877,7 +878,7 @@ const nlohmann::json socket::srt_group::stats_to_json(int socketid, const SRT_TR } const string socket::srt_group::get_statistics_csv(bool print_header) const { - if (print_header) + if (print_header) return stats_to_csv(m_bind_socket, SRT_TRACEBSTATS(), 0, print_header);; SRT_TRACEBSTATS stats = {};