Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-31 02:32:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

output megabits per second not per interval

Browse source
This commit is contained in:
Stephen Birarda 2015-08-25 15:43:21 -07:00
parent 34b3bd211d
commit 67816c033a
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/udt-test/src/UDTTest.cpp
View file

@ -63,7 +63,7 @@ const QStringList CLIENT_STATS_TABLE_HEADERS {
}; };
const QStringList SERVER_STATS_TABLE_HEADERS { const QStringList SERVER_STATS_TABLE_HEADERS {
"Megabits", "Recv P/s", "Est. Max (P/s)", "RTT (ms)", "CW (P)", " Mb/s ", "Recv P/s", "Est. Max (P/s)", "RTT (ms)", "CW (P)",
"Sent ACK", "Sent LACK", "Sent NAK", "Sent TNAK", "Sent ACK", "Sent LACK", "Sent NAK", "Sent TNAK",
"Recv ACK2", "Duplicates (P)" "Recv ACK2", "Duplicates (P)"
}; };
@ -180,18 +180,15 @@ UDTTest::UDTTest(int& argc, char** argv) :
_socket.setPacketListHandler(std::bind(&UDTTest::handlePacketList, this, _1)); _socket.setPacketListHandler(std::bind(&UDTTest::handlePacketList, this, _1));
} }
// the sender reports stats every 100 milliseconds // the sender reports stats every 100 milliseconds, unless passed a custom value
static const int STATS_SAMPLE_INTERVAL = 100;
int statsInterval = STATS_SAMPLE_INTERVAL;
if (_argumentParser.isSet(STATS_INTERVAL)) { if (_argumentParser.isSet(STATS_INTERVAL)) {
statsInterval = _argumentParser.value(STATS_INTERVAL).toInt(); _statsInterval = _argumentParser.value(STATS_INTERVAL).toInt();
} }
QTimer* statsTimer = new QTimer(this); QTimer* statsTimer = new QTimer(this);
connect(statsTimer, &QTimer::timeout, this, &UDTTest::sampleStats); connect(statsTimer, &QTimer::timeout, this, &UDTTest::sampleStats);
statsTimer->start(statsInterval); statsTimer->start(_statsInterval);
} }
void UDTTest::parseArguments() { void UDTTest::parseArguments() {
@ -387,10 +384,13 @@ void UDTTest::sampleStats() {
int headerIndex = -1; int headerIndex = -1;
static const double MEGABITS_PER_BYTE = 8.0 / 1000000.0; static const double MEGABITS_PER_BYTE = 8.0 / 1000000.0;
static const double MS_PER_SECOND = 1000.0;
double megabitsPerSecond = (stats.receivedBytes * MEGABITS_PER_BYTE * MS_PER_SECOND) / _statsInterval;
// setup a list of left justified values // setup a list of left justified values
QStringList values { QStringList values {
QString::number(stats.receivedBytes * MEGABITS_PER_BYTE, 'f', 2).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(megabitsPerSecond, 'f', 2).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.receiveRate).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.receiveRate).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.estimatedBandwith).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.estimatedBandwith).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.rtt / USECS_PER_MSEC, 'f', 2).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.rtt / USECS_PER_MSEC, 'f', 2).rightJustified(SERVER_STATS_TABLE_HEADERS[++headerIndex].size()),

2
tools/udt-test/src/UDTTest.h
View file

@ -60,6 +60,8 @@ private:
int _totalQueuedPackets { 0 }; // keeps track of the number of packets we have already queued int _totalQueuedPackets { 0 }; // keeps track of the number of packets we have already queued
int _totalQueuedBytes { 0 }; // keeps track of the number of bytes we have already queued int _totalQueuedBytes { 0 }; // keeps track of the number of bytes we have already queued
int _statsInterval { 100 }; // recording interval for stats in milliseconds
}; };
#endif // hifi_UDTTest_h #endif // hifi_UDTTest_h