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
116 OCTREE_PACKET_SEQUENCE completionNumber;116 OCTREE_PACKET_SEQUENCE completionNumber;
117 message->readPrimitive(&completionNumber);117 message->readPrimitive(&completionNumber);
118 118
119 Locker lock(_completionMutex);
120 _completionSequenceNumber = completionNumber;119 _completionSequenceNumber = completionNumber;
121 _completionSequenceNumberValid = true;
122 } break;120 } break;
123 121
124 default: {122 default: {
@@ -128,8 +126,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag · 3 unmodified lines
128}126}
129 127
130void OctreePacketProcessor::resetCompletionSequenceNumber() {128void OctreePacketProcessor::resetCompletionSequenceNumber() {
131 Locker lock(_completionMutex);129 _completionSequenceNumber = -1;
132 _completionSequenceNumber = false;
133}130}
134 131
135namespace {132namespace {
@@ -143,8 +140,7 @@ namespace { · 7 unmodified lines
143}140}
144 141
145bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const {142bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const {
146 Locker lock(_completionMutex);
147 // If we've received the flagged seq # and the current one is >= it.143 // If we've received the flagged seq # and the current one is >= it.
148 return _completionSequenceNumberValid &&144 return _completionSequenceNumber != -1 &&
149 !lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber);145 !lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber);
150}146}