Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 09:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

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