Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace int+bool with single atomic int

Browse source
This commit is contained in:
Simon Walton 2018-07-31 18:28:14 -07:00
parent a320308eaf
commit ed75fe673e
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -116,9 +116,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
OCTREE_PACKET_SEQUENCE completionNumber;
message->readPrimitive(&completionNumber);
Locker lock(_completionMutex);
_completionSequenceNumber = completionNumber;
_completionSequenceNumberValid = true;
} break;
default: {
@ -128,8 +126,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
}
void OctreePacketProcessor::resetCompletionSequenceNumber() {
Locker lock(_completionMutex);
_completionSequenceNumber = false;
_completionSequenceNumber = -1;
}
namespace {
@ -143,8 +140,7 @@ namespace {
}
bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const {
Locker lock(_completionMutex);
// If we've received the flagged seq # and the current one is >= it.
return _completionSequenceNumberValid &&
return _completionSequenceNumber != -1 &&
!lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber);
}

5
interface/src/octree/OctreePacketProcessor.h
View file

@ -37,10 +37,7 @@ private slots:
void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
private:
mutable std::mutex _completionMutex;
using Locker = std::lock_guard<std::mutex>;
bool _completionSequenceNumberValid { false };
int _completionSequenceNumber { 0 };
std::atomic<int> _completionSequenceNumber { -1 };
};
#endif // hifi_OctreePacketProcessor_h