From df1e97c591cd88d2df7fd8a441acf3fdc40d5d33 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 31 Jul 2015 17:19:14 -0700 Subject: [PATCH] cleanup RTT stats, add assert for CT --- libraries/networking/src/udt/ControlPacket.cpp | 5 ++++- tools/udt-test/src/UDTTest.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/udt/ControlPacket.cpp b/libraries/networking/src/udt/ControlPacket.cpp index 626e126c03..f1e3b71b67 100644 --- a/libraries/networking/src/udt/ControlPacket.cpp +++ b/libraries/networking/src/udt/ControlPacket.cpp @@ -120,6 +120,9 @@ void ControlPacket::readType() { Q_ASSERT_X(bitAndType & CONTROL_BIT_MASK, "ControlPacket::readHeader()", "This should be a control packet"); + uint16_t packetType = (bitAndType & ~CONTROL_BIT_MASK) >> (8 * sizeof(Type)); + Q_ASSERT_X(packetType < ControlPacket::Type::TimeoutNAK, "ControlPacket::readType()", "Received a control packet with wrong type"); + // read the type - _type = (Type) ((bitAndType & ~CONTROL_BIT_MASK) >> (8 * sizeof(Type))); + _type = (Type) packetType; } diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp index 067a7ec746..d0c7b159df 100644 --- a/tools/udt-test/src/UDTTest.cpp +++ b/tools/udt-test/src/UDTTest.cpp @@ -218,10 +218,12 @@ 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.receiveRate).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), - QString::number(stats.rtt).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), + QString::number(stats.rtt / USECS_PER_MSEC).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.congestionWindowSize).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.packetSendPeriod).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.receivedACKs).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()),