From 40520c204ff099eb2e67c24f6846042bb89d8320 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 3 Aug 2015 17:39:09 -0700 Subject: [PATCH] Stats improvement --- libraries/networking/src/udt/Connection.cpp | 2 ++ libraries/networking/src/udt/PacketTimeWindow.cpp | 4 ++-- tools/udt-test/src/UDTTest.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index 85f103f438..2219de6fd6 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -508,6 +508,8 @@ void Connection::processACK2(std::unique_ptr controlPacket) { int rtt = duration_cast(now - it->second.second).count(); updateRTT(rtt); + // write this RTT to stats + _stats.recordRTT(rtt); // set the RTT for congestion control _congestionControl->setRTT(_rtt); diff --git a/libraries/networking/src/udt/PacketTimeWindow.cpp b/libraries/networking/src/udt/PacketTimeWindow.cpp index 269d158b7d..9193e8e0af 100644 --- a/libraries/networking/src/udt/PacketTimeWindow.cpp +++ b/libraries/networking/src/udt/PacketTimeWindow.cpp @@ -19,8 +19,8 @@ using namespace udt; using namespace std::chrono; -static const int DEFAULT_PACKET_INTERVAL_MICROSECONDS = 1000000; -static const int DEFAULT_PROBE_INTERVAL_MICROSECONDS = 1000; +static const int DEFAULT_PACKET_INTERVAL_MICROSECONDS = 1000000; // 1s +static const int DEFAULT_PROBE_INTERVAL_MICROSECONDS = 1000; // 1ms PacketTimeWindow::PacketTimeWindow(int numPacketIntervals, int numProbeIntervals) : _numPacketIntervals(numPacketIntervals), diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp index 6344860442..8cc141c83f 100644 --- a/tools/udt-test/src/UDTTest.cpp +++ b/tools/udt-test/src/UDTTest.cpp @@ -220,6 +220,7 @@ void UDTTest::sendPacket() { void UDTTest::sampleStats() { static bool first = true; + static const double USECS_PER_MSEC = 1000.0; if (!_target.isNull()) { if (first) { @@ -232,8 +233,6 @@ void UDTTest::sampleStats() { int headerIndex = -1; - static const double USECS_PER_MSEC = 1000.0; - // setup a list of left justified values QStringList values { QString::number(stats.sendRate).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()), @@ -269,6 +268,9 @@ void UDTTest::sampleStats() { // setup a list of left justified values QStringList values { QString::number(stats.receiveRate).leftJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), + QString::number(stats.estimatedBandwith).leftJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), + QString::number(stats.rtt / USECS_PER_MSEC).leftJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), + QString::number(stats.congestionWindowSize).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.recievedBytes).leftJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.recievedUtilBytes).leftJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(100 * (double)stats.recievedUtilBytes / (double)stats.recievedBytes).leftJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()),