History

Replace int+bool with single atomic int

Simon Walton committed 8 years ago

Commit ed75fe61 parent a3203082 files · +3 −10Browse files

Showing the changes to interface/src/octree/OctreePacketProcessor.cpp (1 of 2 files). Show all

Unified · Split

interface/src/octree/OctreePacketProcessor.cpp+2−6
@@ -116,9 +116,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag · 115 unmodified lines
116116 OCTREE_PACKET_SEQUENCE completionNumber;
117117 message->readPrimitive(&completionNumber);
118118
119− Locker lock(_completionMutex);
120119 _completionSequenceNumber = completionNumber;
121− _completionSequenceNumberValid = true;
122120 } break;
123121
124122 default: {
@@ -128,8 +126,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag · 3 unmodified lines
128126 }
129127
130128 void OctreePacketProcessor::resetCompletionSequenceNumber() {
131− Locker lock(_completionMutex);
132− _completionSequenceNumber = false;
129+ _completionSequenceNumber = -1;
133130 }
134131
135132 namespace {
@@ -143,8 +140,7 @@ namespace { · 7 unmodified lines
143140 }
144141
145142 bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const {
146− Locker lock(_completionMutex);
147143 // If we've received the flagged seq # and the current one is >= it.
148− return _completionSequenceNumberValid &&
144+ return _completionSequenceNumber != -1 &&
149145 !lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber);
150146 }