BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-18 22:30:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix data race issue no.2

Browse Source
This commit is contained in:
Lion Kortlepel
2021-03-30 15:19:11 +02:00
parent e4d6c86919
commit 61726ea3ab
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/TNetwork.cpp
View File

@@ -338,15 +338,22 @@ std::shared_ptr<TClient> TNetwork::CreateClient(SOCKET TCPSock) {
bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) { bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
if (!IsSync) { if (!IsSync) {
std::unique_lock Lock(c.MissedPacketQueueMutex());
if (c.IsSyncing()) { if (c.IsSyncing()) {
std::unique_lock Lock(c.MissedPacketQueueMutex());
c.EnqueueMissedPacketDuringSyncing(Data); c.EnqueueMissedPacketDuringSyncing(Data);
return true; return true;
} else if (!c.IsSyncing() && c.IsSynced() && c.MissedPacketQueueSize() != 0) { } else if (!c.IsSyncing() && c.IsSynced() && c.MissedPacketQueueSize() != 0) {
debug("sending " + std::to_string(c.MissedPacketQueueSize()) + " missed packets"); debug("sending " + std::to_string(c.MissedPacketQueueSize()) + " missed packets");
while (c.MissedPacketQueueSize() > 0) { while (c.MissedPacketQueueSize() > 0) {
std::string QData = c.MissedPacketQueue().front(); std::string QData {};
c.MissedPacketQueue().pop(); { // locked context
std::unique_lock lock(c.MissedPacketQueueMutex());
if (c.MissedPacketQueueSize() <= 0) {
break;
}
QData = c.MissedPacketQueue().front();
c.MissedPacketQueue().pop();
} // end locked context
// debug("sending a missed packet: " + QData); // debug("sending a missed packet: " + QData);
TCPSend(c, QData, true); TCPSend(c, QData, true);
} }