From 6edba6d545b4f774d095de3a33e7f75274e4d4dc Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 25 Aug 2017 11:04:24 -0700 Subject: [PATCH] erase in _entitiesInQueue when pop _sendQueue --- assignment-client/src/entities/EntityTreeSendThread.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp index 851d0566ac..0d71aa9619 100644 --- a/assignment-client/src/entities/EntityTreeSendThread.cpp +++ b/assignment-client/src/entities/EntityTreeSendThread.cpp @@ -143,8 +143,10 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O #endif _traversal.traverse(TIME_BUDGET); - uint64_t dt = usecTimestampNow() - startTime; - std::cout << "adebug traversal complete " << " Q.size = " << _sendQueue.size() << " dt = " << dt << std::endl; // adebug + if (_sendQueue.size() > 0) { + uint64_t dt = usecTimestampNow() - startTime; + std::cout << "adebug traversal complete " << " Q.size = " << _sendQueue.size() << " dt = " << dt << std::endl; // adebug + } } #ifndef SEND_SORTED_ENTITIES @@ -416,8 +418,10 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream ++_numEntities; } _sendQueue.pop(); + _entitiesInQueue.erase(entity.get()); } if (_sendQueue.empty()) { + assert(_entitiesInQueue.empty()); params.stopReason = EncodeBitstreamParams::FINISHED; _extraEncodeData->entities.clear(); }