mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do the gamestate compression in the task-manager

Browse Source 
This reduces the stutter when a client joins.
The decompression isn't put on the task manager. As the client would
have to wait for that either way. Also a new polling loop would have to
be introduced.

The compression code is moved to the file transferer so all data send
through it gits compressed.

Refs: #4210
This commit is contained in:
phosit
2026-04-03 18:38:13 +02:00
parent 6a3da535f3
commit 6893654cfc
4 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/network/NetFileTransfer.cpp
+26 -7
View File
@@ -25,6 +25,8 @@
#include "network/NetMessage.h"
#include "ps/CLogger.h"
#include "ps/CStr.h"
#include "ps/Compress.h"
#include "ps/TaskManager.h"
#include <algorithm>
#include <utility>
@@ -102,7 +104,9 @@ Status CNetFileTransferer::OnFileTransferData(const CFileTransferDataMessage& me
{
LOGMESSAGERENDER("Download completed");
task.onComplete(std::move(task.buffer));
std::string uncompressed;
DecompressZLib(task.buffer, uncompressed, true);
task.onComplete(std::move(uncompressed));
m_FileReceiveTasks.erase(it);
return INFO::OK;
}
@@ -161,16 +165,18 @@ void CNetFileTransferer::StartResponse(u32 requestID, const std::string& data)
{
CNetFileSendTask task;
task.requestID = requestID;
task.buffer = data;
task.offset = 0;
task.packetsInFlight = 0;
task.maxWindowSize = DEFAULT_FILE_TRANSFER_WINDOW_SIZE;
task.task = {g_TaskManager, [data]
{
// Compress the content with zlib to save bandwidth
std::string compressedGameState;
CompressZLib(std::move(data), compressedGameState, true);
return compressedGameState;
}, Threading::TaskPriority::LOW};
m_FileSendTasks[task.requestID] = task;
CFileTransferResponseMessage respMessage;
respMessage.m_RequestID = requestID;
respMessage.m_Length = task.buffer.size();
m_SendMessage(&respMessage);
m_FileSendTasks.insert({task.requestID, std::move(task)});
}
void CNetFileTransferer::Poll()
@@ -181,6 +187,19 @@ void CNetFileTransferer::Poll()
{
CNetFileSendTask& task = p.second;
if (task.task.Valid())
{
if (!task.task.IsDone())
continue;
task.buffer = std::exchange(task.task, {}).Get();
CFileTransferResponseMessage respMessage;
respMessage.m_RequestID = task.requestID;
respMessage.m_Length = task.buffer.size();
m_SendMessage(&respMessage);
}
while (task.packetsInFlight < task.maxWindowSize && task.offset < task.buffer.size())
{
CFileTransferDataMessage dataMessage;