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

Undoing unwisdom

Browse source
This commit is contained in:
Brad Davis 2015-07-01 14:54:26 -07:00
parent 4c200d75bc
commit 1e1f199fdb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/networking/src/ReceivedPacketProcessor.cpp
View file

@ -23,7 +23,7 @@ void ReceivedPacketProcessor::queueReceivedPacket(const SharedNodePointer& sendi
NetworkPacket networkPacket(sendingNode, packet); NetworkPacket networkPacket(sendingNode, packet);
lock(); lock();
_queuedPackets.push_back(networkPacket); _packets.push_back(networkPacket);
_nodePacketCounts[sendingNode->getUUID()]++; _nodePacketCounts[sendingNode->getUUID()]++;
unlock(); unlock();
@ -33,28 +33,29 @@ void ReceivedPacketProcessor::queueReceivedPacket(const SharedNodePointer& sendi
bool ReceivedPacketProcessor::process() { bool ReceivedPacketProcessor::process() {
if (_queuedPackets.size() == 0) { if (_packets.size() == 0) {
_waitingOnPacketsMutex.lock(); _waitingOnPacketsMutex.lock();
_hasPackets.wait(&_waitingOnPacketsMutex, getMaxWait()); _hasPackets.wait(&_waitingOnPacketsMutex, getMaxWait());
_waitingOnPacketsMutex.unlock(); _waitingOnPacketsMutex.unlock();
} }
preProcess(); preProcess();
if (!_queuedPackets.size()) { QVector<NetworkPacket> currentPackets;
if (!_packets.size()) {
return isStillRunning(); return isStillRunning();
} }
lock(); lock();
_processingPackets.swap(_queuedPackets); std::swap(currentPackets, _packets);
unlock(); unlock();
foreach(auto& packet, _processingPackets) { foreach(auto& packet, currentPackets) {
processPacket(packet.getNode(), packet.getByteArray()); processPacket(packet.getNode(), packet.getByteArray());
midProcess(); midProcess();
} }
lock(); lock();
foreach(auto& packet, _processingPackets) { foreach(auto& packet, currentPackets) {
_nodePacketCounts[packet.getNode()->getUUID()]--; _nodePacketCounts[packet.getNode()->getUUID()]--;
} }
unlock(); unlock();

3
libraries/networking/src/ReceivedPacketProcessor.h
View file

@ -75,8 +75,7 @@ protected:
protected: protected:
QVector<NetworkPacket> _queuedPackets; QVector<NetworkPacket> _packets;
QVector<NetworkPacket> _processingPackets;
QHash<QUuid, int> _nodePacketCounts; QHash<QUuid, int> _nodePacketCounts;
QWaitCondition _hasPackets; QWaitCondition _hasPackets;