From 45f194f6bc18dc9bcae1974721b9ec284878c77f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 23 Aug 2017 14:05:05 -0700 Subject: [PATCH] use SKIP_TIME again instead of 0.0 --- assignment-client/src/octree/OctreeSendThread.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp index 9e37be4b4e..9345f96b1d 100644 --- a/assignment-client/src/octree/OctreeSendThread.cpp +++ b/assignment-client/src/octree/OctreeSendThread.cpp @@ -480,6 +480,9 @@ bool OctreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamPara }); OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart)); + } else { + OctreeServer::trackTreeWaitTime(OctreeServer::SKIP_TIME); + OctreeServer::trackEncodeTime(OctreeServer::SKIP_TIME); } return somethingToSend; } @@ -512,8 +515,8 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre bool somethingToSend = true; // assume we have something bool bagHadSomething = !nodeData->elementBag.isEmpty(); while (somethingToSend && _packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) { - float compressAndWriteElapsedUsec = 0.0f; - float packetSendingElapsedUsec = 0.0f; + float compressAndWriteElapsedUsec = OctreeServer::SKIP_TIME; + float packetSendingElapsedUsec = OctreeServer::SKIP_TIME; quint64 startInside = usecTimestampNow(); @@ -568,11 +571,6 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre } _packetData.changeSettings(true, targetSize); // will do reset - NOTE: Always compressed } - if (!somethingToSend) { - // these stats were not updated so we record zero to record this fact - OctreeServer::trackTreeWaitTime(0.0f); - OctreeServer::trackEncodeTime(0.0f); - } OctreeServer::trackCompressAndWriteTime(compressAndWriteElapsedUsec); OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec); OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));