Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 08:48:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use SKIP_TIME again instead of 0.0

Browse source
This commit is contained in:
Andrew Meadows 2017-08-23 14:05:05 -07:00
parent 4be119b729
commit 45f194f6bc
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -480,6 +480,9 @@ bool OctreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamPara
}); });
OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart)); OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart));
} else {
OctreeServer::trackTreeWaitTime(OctreeServer::SKIP_TIME);
OctreeServer::trackEncodeTime(OctreeServer::SKIP_TIME);
} }
return somethingToSend; return somethingToSend;
} }
@ -512,8 +515,8 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
bool somethingToSend = true; // assume we have something bool somethingToSend = true; // assume we have something
bool bagHadSomething = !nodeData->elementBag.isEmpty(); bool bagHadSomething = !nodeData->elementBag.isEmpty();
while (somethingToSend && _packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) { while (somethingToSend && _packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) {
float compressAndWriteElapsedUsec = 0.0f; float compressAndWriteElapsedUsec = OctreeServer::SKIP_TIME;
float packetSendingElapsedUsec = 0.0f; float packetSendingElapsedUsec = OctreeServer::SKIP_TIME;
quint64 startInside = usecTimestampNow(); quint64 startInside = usecTimestampNow();
@ -568,11 +571,6 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
} }
_packetData.changeSettings(true, targetSize); // will do reset - NOTE: Always compressed _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::trackCompressAndWriteTime(compressAndWriteElapsedUsec);
OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec); OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec);
OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside)); OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));