games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Simple workaround to fix vcmiserver shutdown procedure

Browse Source 
At the moment, vcmilobby *requires* async writes in order to handle
multiple connections with different speeds and at optimal performance,
without hanging if one player is too slow and can't eat all data server
sent to him at once.

However server (and potentially - client) can not handle this mode and
may shutdown either socket or entire asio service too early, before all
writes are performed, leading to weird freeze on ending scenario where
client would not receive notifications about end of game.
This commit is contained in:
Ivan Savenko
2024-05-14 19:40:20 +00:00
parent da9d82b697
commit 35954dc41b
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/network/NetworkConnection.cpp
View File

@ -127,6 +127,11 @@ void NetworkConnection::onPacketReceived(const boost::system::error_code & ec, u
startReceiving();
}
void NetworkConnection::setAsyncWritesEnabled(bool on)
{
asyncWritesEnabled = on;
}
void NetworkConnection::sendPacket(const std::vector<std::byte> & message)
{
std::lock_guard<std::mutex> lock(writeMutex);
@ -134,14 +139,27 @@ void NetworkConnection::sendPacket(const std::vector<std::byte> & message)
uint32_t messageSize = message.size();
std::memcpy(headerVector.data(), &messageSize, sizeof(uint32_t));
bool messageQueueEmpty = dataToSend.empty();
dataToSend.push_back(headerVector);
if (message.size() > 0)
dataToSend.push_back(message);
// At the moment, vcmilobby *requires* async writes in order to handle multiple connections with different speeds and at optimal performance
// However server (and potentially - client) can not handle this mode and may shutdown either socket or entire asio service too early, before all writes are performed
if (asyncWritesEnabled)
{
if (messageQueueEmpty)
doSendData();
//else - data sending loop is still active and still sending previous messages
bool messageQueueEmpty = dataToSend.empty();
dataToSend.push_back(headerVector);
if (message.size() > 0)
dataToSend.push_back(message);
if (messageQueueEmpty)
doSendData();
//else - data sending loop is still active and still sending previous messages
}
else
{
boost::system::error_code ec;
boost::asio::write(*socket, boost::asio::buffer(headerVector), ec );
if (message.size() > 0)
boost::asio::write(*socket, boost::asio::buffer(message), ec );
}
}
void NetworkConnection::doSendData()