Skip to content

Update apputil.cpp #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaodius wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update apputil.cpp #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions apps/apputil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <sstream>
#include <utility>
#include <memory>
#include <ctime>
#include <string.h>

#include "apputil.hpp"
#include "netinet_any.h"
Expand Down Expand Up @@ -344,10 +346,17 @@ class SrtStatsJson : public SrtStatsWriter
public:
string WriteStats(int sid, const CBytePerfMon& mon) override
{
// Get current system time
time_t tt;
time (&tt);
char timestr [30];
strftime(timestr,30,"%F %T",localtime(&tt));

std::ostringstream output;
output << "{";
output << "\"sid\":" << sid << ",";
output << "\"time\":" << mon.msTimeStamp << ",";
output << "\"systime\":\"" << timestr << "\",";
output << "\"window\":{";
output << "\"flow\":" << mon.pktFlowWindow << ",";
output << "\"congestion\":" << mon.pktCongestionWindow << ",";
Expand Down Expand Up @@ -408,10 +417,16 @@ class SrtStatsCsv : public SrtStatsWriter

string WriteStats(int sid, const CBytePerfMon& mon) override
{
// Get current system time
time_t tt;
time (&tt);
char timestr [30];
strftime(timestr,30,"%F %T",localtime(&tt));

std::ostringstream output;
if (!first_line_printed)
{
output << "Time,SocketID,pktFlowWindow,pktCongestionWindow,pktFlightSize,";
output << "SysTime,Time,SocketID,pktFlowWindow,pktCongestionWindow,pktFlightSize,";
output << "msRTT,mbpsBandwidth,mbpsMaxBW,pktSent,pktSndLoss,pktSndDrop,";
output << "pktRetrans,byteSent,byteSndDrop,mbpsSendRate,usPktSndPeriod,";
output << "pktRecv,pktRcvLoss,pktRcvDrop,pktRcvRetrans,pktRcvBelated,";
Expand All @@ -425,6 +440,7 @@ class SrtStatsCsv : public SrtStatsWriter
int int_len = sizeof rcv_latency;
srt_getsockopt(sid, 0, SRTO_RCVLATENCY, &rcv_latency, &int_len);

output << timestr << ",";
output << mon.msTimeStamp << ",";
output << sid << ",";
output << mon.pktFlowWindow << ",";
Expand Down Expand Up @@ -473,8 +489,12 @@ class SrtStatsCols : public SrtStatsWriter
public:
string WriteStats(int sid, const CBytePerfMon& mon) override
{
// Get current system time
time_t tt;
time (&tt);

std::ostringstream output;
output << "======= SRT STATS: sid=" << sid << endl;
output << "======= SRT STATS: sid=" << sid << " System Time: " << strtok(ctime(&tt),"\n") << endl;
output << "PACKETS SENT: " << setw(11) << mon.pktSent << " RECEIVED: " << setw(11) << mon.pktRecv << endl;
output << "LOST PKT SENT: " << setw(11) << mon.pktSndLoss << " RECEIVED: " << setw(11) << mon.pktRcvLoss << endl;
output << "REXMIT SENT: " << setw(11) << mon.pktRetrans << " RECEIVED: " << setw(11) << mon.pktRcvRetrans << endl;
Expand Down