mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-08-15 22:53:31 -07:00
71be79791f
Some checks failed
checkrefs / lfscheck (push) Has been cancelled
checkrefs / checkrefs (push) Has been cancelled
lint / cppcheck (push) Has been cancelled
lint / copyright (push) Has been cancelled
lint / jenkinsfiles (push) Has been cancelled
pre-commit / build (push) Has been cancelled
CSimulation2 used , CSimulation2Impl mixed /, and CTurnManager used for the same turn-count concept, forcing a static_cast<int64_t> at the one place these types already met (rejoin-test comparison). Add (alias for std::int32_t) in SimulationCommand.h and use it consistently for every turn counter in CSimulation2/Impl, CTurnManager and its subclasses (CLocalTurnManager, CReplayTurnManager), CNetServerTurnManager/CNetClientTurnManager, and the network wire format (m_Turn in CEndCommandBatchMessage, CSimulationMessage, CSyncCheckMessage, CSyncErrorMessage, and m_CurrentTurn in CLoadedGameMessage). Turn *duration* fields (m_TurnLength, m_CommandDelay, DEFAULT_TURN_LENGTH, COMMAND_DELAY_SP/MP, SetTurnLength, GetSavedTurnLength return type) are left as u32 — they're milliseconds, not a counter, and out of scope here. Remaining turn_id_t vs size_t comparisons use std::cmp_equal or explicit casts, matching the existing pattern in Simulation2.cpp. Fixes #8718
111 lines
3.1 KiB
C++
111 lines
3.1 KiB
C++
/* Copyright (C) 2026 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_NETSERVERTURNMANAGER
|
|
#define INCLUDED_NETSERVERTURNMANAGER
|
|
|
|
#include "lib/code_annotation.h"
|
|
#include "lib/types.h"
|
|
#include "ps/CStr.h"
|
|
#include "simulation2/helpers/SimulationCommand.h"
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <unordered_map>
|
|
#include <vector>
|
|
|
|
class CNetServerSession;
|
|
class CNetServerWorker;
|
|
|
|
/**
|
|
* The server-side counterpart to CNetClientTurnManager.
|
|
* Records the turn state of each client, and sends turn advancement messages
|
|
* when clients are ready.
|
|
*
|
|
* Thread-safety:
|
|
* - This is constructed and used by CNetServerWorker in the network server thread.
|
|
*/
|
|
class CNetServerTurnManager
|
|
{
|
|
NONCOPYABLE(CNetServerTurnManager);
|
|
public:
|
|
CNetServerTurnManager(CNetServerWorker& server);
|
|
|
|
void NotifyFinishedClientCommands(CNetServerSession& session, turn_id_t turn);
|
|
|
|
void NotifyFinishedClientUpdate(CNetServerSession& session, turn_id_t turn, const CStr& hash);
|
|
|
|
/**
|
|
* Inform the turn manager of a new client
|
|
* @param observer - whether this client is an observer.
|
|
*/
|
|
void InitialiseClient(int client, turn_id_t turn, bool observer);
|
|
|
|
/**
|
|
* Inform the turn manager that a previously-initialised client has left the game.
|
|
*/
|
|
void UninitialiseClient(int client);
|
|
|
|
void SetTurnLength(u32 msecs);
|
|
|
|
/**
|
|
* Returns the latest turn for which all clients are ready;
|
|
* they will have already been told to execute this turn.
|
|
*/
|
|
turn_id_t GetReadyTurn() { return m_ReadyTurn; }
|
|
|
|
/**
|
|
* Returns the turn length that was used for the given turn.
|
|
* Requires turn <= GetReadyTurn().
|
|
*/
|
|
u32 GetSavedTurnLength(turn_id_t turn);
|
|
|
|
private:
|
|
void CheckClientsReady();
|
|
|
|
struct Client
|
|
{
|
|
CStrW playerName;
|
|
// Latest turn for which all commands have been received.
|
|
turn_id_t readyTurn;
|
|
// Last known simulated turn.
|
|
turn_id_t simulatedTurn;
|
|
bool isObserver;
|
|
bool isOOS = false;
|
|
};
|
|
|
|
std::unordered_map<int, Client> m_ClientsData;
|
|
|
|
// Cached value - is any client OOS? This is reset when the OOS client leaves.
|
|
bool m_HasSyncError = false;
|
|
|
|
// Map of turn -> {Client ID -> state hash}; old indexes <= min(m_ClientsSimulated) are deleted
|
|
std::map<turn_id_t, std::map<int, std::string>> m_ClientStateHashes;
|
|
|
|
/// The latest turn for which we have received all commands from all clients
|
|
turn_id_t m_ReadyTurn;
|
|
|
|
// Current turn length
|
|
u32 m_TurnLength;
|
|
|
|
// Turn lengths for all previously executed turns
|
|
std::vector<u32> m_SavedTurnLengths;
|
|
|
|
CNetServerWorker& m_NetServer;
|
|
};
|
|
|
|
#endif // INCLUDED_NETSERVERTURNMANAGER
|