From 20f33b3b64f40349e7dbca4ce4e66aae55aa5011 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 3 Aug 2015 14:34:12 -0700 Subject: [PATCH] fix sendqueue sleep timing to use microseconds --- libraries/networking/src/udt/SendQueue.cpp | 2 +- tools/udt-test/src/UDTTest.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/udt/SendQueue.cpp b/libraries/networking/src/udt/SendQueue.cpp index 7186316bc0..3aeeec4d4a 100644 --- a/libraries/networking/src/udt/SendQueue.cpp +++ b/libraries/networking/src/udt/SendQueue.cpp @@ -250,7 +250,7 @@ void SendQueue::run() { // sleep as long as we need until next packet send, if we can auto now = high_resolution_clock::now(); - auto microsecondDuration = (_lastSendTimestamp + microseconds(_packetSendPeriod)) - now; + auto microsecondDuration = duration_cast((_lastSendTimestamp + microseconds(_packetSendPeriod)) - now); if (microsecondDuration.count() > 0) { usleep(microsecondDuration.count()); diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp index f6ce1cc5ac..5bc020c370 100644 --- a/tools/udt-test/src/UDTTest.cpp +++ b/tools/udt-test/src/UDTTest.cpp @@ -44,7 +44,7 @@ const QCommandLineOption UNRELIABLE_PACKETS { const QStringList STATS_TABLE_HEADERS { "Send Rate (P/s)", "RTT(ms)", "CW (P)", "Send Period (us)", "Received ACK", "Processed ACK", "Received LACK", "Received NAK", "Received TNAK", - "Sent ACK2", "Re-sent Packets" + "Sent ACK2", "Sent Packets", "Re-sent Packets" }; UDTTest::UDTTest(int& argc, char** argv) : @@ -234,6 +234,7 @@ void UDTTest::sampleStats() { QString::number(stats.events[udt::ConnectionStats::Stats::ReceivedNAK]).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.events[udt::ConnectionStats::Stats::ReceivedTimeoutNAK]).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.events[udt::ConnectionStats::Stats::SentACK2]).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), + QString::number(stats.sentPackets).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.events[udt::ConnectionStats::Stats::Retransmission]).leftJustified(STATS_TABLE_HEADERS[++headerIndex].size()) };