sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/ENetPeer: Optimize CheckTimeouts function

This commit is contained in:
Lynix 2017-02-16 23:26:28 +01:00
parent b7ee6d7b29
commit e0dca1b043
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Nazara/Network/ENetPeer.cpp
View File

@ -271,39 +271,38 @@ namespace Nz
bool ENetPeer::CheckTimeouts(ENetEvent* event) bool ENetPeer::CheckTimeouts(ENetEvent* event)
{ {
UInt32 serviceTime = m_host->GetServiceTime(); UInt32 serviceTime = m_host->GetServiceTime();
bool timedOut = false;
auto currentCommand = m_sentReliableCommands.begin(); auto it = m_sentReliableCommands.begin();
while (currentCommand != m_sentReliableCommands.end()) for (; it != m_sentReliableCommands.end(); ++it)
{ {
auto outgoingCommand = currentCommand; OutgoingCommand& command = *it;
++currentCommand; if (ENetTimeDifference(serviceTime, command.sentTime) < command.roundTripTimeout)
if (ENetTimeDifference(serviceTime, outgoingCommand->sentTime) < outgoingCommand->roundTripTimeout)
continue; continue;
if (m_earliestTimeout == 0 || ENetTimeLess(outgoingCommand->sentTime, m_earliestTimeout)) if (m_earliestTimeout == 0 || ENetTimeLess(command.sentTime, m_earliestTimeout))
m_earliestTimeout = outgoingCommand->sentTime; m_earliestTimeout = command.sentTime;
if (m_earliestTimeout != 0 && (ENetTimeDifference(serviceTime, m_earliestTimeout) >= m_timeoutMaximum || if (m_earliestTimeout != 0 && (ENetTimeDifference(serviceTime, m_earliestTimeout) >= m_timeoutMaximum ||
(outgoingCommand->roundTripTimeout >= outgoingCommand->roundTripTimeoutLimit && ENetTimeDifference(serviceTime, m_earliestTimeout) >= m_timeoutMinimum))) (command.roundTripTimeout >= command.roundTripTimeoutLimit && ENetTimeDifference(serviceTime, m_earliestTimeout) >= m_timeoutMinimum)))
{ {
m_host->NotifyDisconnect(this, event); m_host->NotifyDisconnect(this, event);
return true; timedOut = true;
break;
} }
if (outgoingCommand->packet) if (command.packet)
m_reliableDataInTransit -= outgoingCommand->fragmentLength; m_reliableDataInTransit -= command.fragmentLength;
++m_packetsLost; ++m_packetsLost;
++m_totalPacketLost; ++m_totalPacketLost;
// http://lists.cubik.org/pipermail/enet-discuss/2014-May/002308.html // http://lists.cubik.org/pipermail/enet-discuss/2014-May/002308.html
outgoingCommand->roundTripTimeout = m_roundTripTime + 4 * m_roundTripTimeVariance; command.roundTripTimeout = m_roundTripTime + 4 * m_roundTripTimeVariance;
outgoingCommand->roundTripTimeoutLimit = m_timeoutLimit * outgoingCommand->roundTripTimeout; command.roundTripTimeoutLimit = m_timeoutLimit * command.roundTripTimeout;
m_outgoingReliableCommands.emplace_front(std::move(*outgoingCommand)); m_outgoingReliableCommands.emplace_front(std::move(command));
m_sentReliableCommands.erase(outgoingCommand);
// Okay this should just never procs, I don't see how it would be possible // Okay this should just never procs, I don't see how it would be possible
/*if (currentCommand == enet_list_begin(&peer->sentReliableCommands) && /*if (currentCommand == enet_list_begin(&peer->sentReliableCommands) &&
@ -315,7 +314,9 @@ namespace Nz
}*/ }*/
} }
return false; m_sentReliableCommands.erase(m_sentReliableCommands.begin(), it);
return timedOut;
} }
void ENetPeer::DispatchState(ENetPeerState state) void ENetPeer::DispatchState(ENetPeerState state)