mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 09:05:10 -07:00
* [Server] Instrument command processing, game starts, and event loops
Add a lock-free MetricsRegistry that accumulates per-command processing
times in preallocated histogram slots (one per protobuf command type,
bucketed at 1/5/10/25/50/100/250/500/1000/2500/5000 ms +Inf). The
hot-path observeCommand() uses only relaxed atomic adds — no locks,
no allocations, no cache-line ping-pong beyond the unavoidable counter
updates.
Wire the registry into AbstractServerSocketInterface::processCommandContainer()
so every processed command is attributed with its container's wall-clock
time. When a container exceeds metrics/slow_command_ms (default 500),
a warning is logged including the connected username.
Add an EventLoopWatchdog heartbeat that runs on every socket pool thread.
If a heartbeat overshoots metrics/stall_warn_ms (default 2000 ms), the
overshoot is recorded in atomic counters and a warning is logged. Both
thresholds are configurable in servatrice.ini; setting stall_warn_ms to 0
disables the watchdogs entirely.
Track game-start durations via a separate histogram in MetricsRegistry.
Server_Game::startGameNow() measures the time from zone creation through
player materialization and reports it via Server::observeGameStartDurationMs().
Add a live card-count gauge: Server_Game exposes getCardsInGame() and
Servatrice::getCardsInGamesTotal() sums across all running games under
the appropriate read locks.
Include a standalone metrics_registry_test (Google Test) that validates
empty registries, single/multi-sample histograms, kind encoding,
overflow-slot collapse, negative-duration clamping, gauge rendering,
and the game-start histogram separation.
Took 10 minutes
* [Client/Server/Protocol] Surface live metrics in the Developer tab
Extend Response_GetServerStats with live counters from the in-process
MetricsRegistry: cards in games, event loop stall totals/worst,
total commands processed, average command time, active command types,
and game-start count/duration. Add a repeated CommandStats message
carrying per-command breakdowns (kind, extension number, resolved
protobuf name, count, total ms) for every type that has seen at
least one sample.
Server-side cmdGetServerStats() populates all new fields after the
existing DB uptime snapshot query, resolving protobuf extension names
via the descriptor pool for human-readable labels like
session/Command_Ping.
Expand TabDeveloper with two tables: an overview section (existing
DB stats plus the new live metrics) and a per-command breakdown table
(Command / Count / Total ms / Avg ms) sorted by total_ms descending
so the hottest commands surface first.
Took 55 minutes
Took 47 seconds
* [Server] Drop dead Prometheus histogram, add developer command metrics, fix watchdog init order
- metrics_registry: remove toPrometheusText/appendCumulativeBuckets and the time-bucket histogram that nothing in production ever emitted (the future /metrics exporter can bring it back); keep counts/totals read by the Developer tab
- Fix +Inf bucket routing that never incremented, and its test that locked the bug in
- Instrument developer_command container (kind 6) in processCommandContainer and stats label resolution
- Read metrics/{slow_command_ms,stall_warn_ms} at the top of initServer() so stall_warn_ms=0 disables the watchdogs before pool threads start
- Shrink KindStride to 1280 (largest extension in use is 1206) with a static_assert; document scrape cost of getCardsInGamesTotal; note slow_command logging has no rate limit in servatrice.ini.example
* [Tests] Give metrics_registry_test an explicit main
* [Server] Record only the dispatched command family; drop unused totals
processCommandContainer recorded every family in a container even though
the base if/else-if dispatch processes at most one. An unauthenticated
client could batch a session command (login) with fabricated developer,
moderator, and admin entries and forge genuine-looking samples that were
never executed or authorized. Mirror the base's selection, skip when the
handler was already deleted, and skip entries whose extension number is
-1 (which would otherwise wrap into the previous kind's id range).
[Server] Drop dead process-lifetime byte/uptime counters
txBytesTotal/rxBytesTotal added an atomic RMW to every socket write and
read for counters nothing consumes (cmdGetServerStats fills tx_bytes,
rx_bytes, and uptime_secs from the DB snapshot). Remove the two atomics
and the getTxBytesTotal/getRxBytesTotal/getUptimeSeconds getters; the
incTxBytes/incRxBytes slots and mutexes remain for the ISL legacy
counters.
[Protocol] Document kind 5 as developer in CommandStats
NumKinds is 6 and the server emits kind_index = 5 for developer
commands; the comment stopped at 4.
* [Client] Togglable auto-refresh for Developer stats tab
* [Oracle] Fix clang-format alignment of card type priority list
---------
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
260 lines
7.8 KiB
C++
260 lines
7.8 KiB
C++
#ifndef SERVER_H
|
|
#define SERVER_H
|
|
|
|
#include "server_player_reference.h"
|
|
|
|
#include <QMultiMap>
|
|
#include <QMutex>
|
|
#include <QObject>
|
|
#include <QReadWriteLock>
|
|
#include <libcockatrice/protocol/pb/commands.pb.h>
|
|
#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
|
|
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
|
|
|
|
class Server_DatabaseInterface;
|
|
class Server_Game;
|
|
class Server_Room;
|
|
class Server_ProtocolHandler;
|
|
class Server_AbstractUserInterface;
|
|
class GameReplay;
|
|
class IslMessage;
|
|
class SessionEvent;
|
|
class RoomEvent;
|
|
class DeckList;
|
|
class ServerInfo_Game;
|
|
class ServerInfo_Room;
|
|
class Response;
|
|
class GameEventContainer;
|
|
class CommandContainer;
|
|
class Command_JoinGame;
|
|
|
|
enum AuthenticationResult
|
|
{
|
|
NotLoggedIn,
|
|
PasswordRight,
|
|
UnknownUser,
|
|
WouldOverwriteOldSession,
|
|
UserIsBanned,
|
|
UsernameInvalid,
|
|
RegistrationRequired,
|
|
UserIsInactive,
|
|
ClientIdRequired,
|
|
PasswordChangeRequired
|
|
};
|
|
|
|
class Server : public QObject
|
|
{
|
|
Q_OBJECT
|
|
signals:
|
|
void pingClockTimeout();
|
|
void sigSendIslMessage(const IslMessage &message, int serverId);
|
|
void endSession(qint64 sessionId);
|
|
private slots:
|
|
void broadcastRoomUpdate(const ServerInfo_Room &roomInfo, bool sendToIsl = false);
|
|
|
|
public:
|
|
mutable QReadWriteLock clientsLock, roomsLock; // locking order: roomsLock before clientsLock
|
|
explicit Server(QObject *parent = nullptr);
|
|
~Server() override = default;
|
|
AuthenticationResult loginUser(Server_ProtocolHandler *session,
|
|
QString &name,
|
|
const QString &password,
|
|
bool passwordNeedsHash,
|
|
QString &reason,
|
|
int &secondsLeft,
|
|
QString &clientid,
|
|
QString &clientVersion,
|
|
QString &connectionType);
|
|
void broadcastUserInfoUpdate(Server_ProtocolHandler *source);
|
|
|
|
const QMap<int, Server_Room *> &getRooms()
|
|
{
|
|
return rooms;
|
|
}
|
|
|
|
Server_AbstractUserInterface *findUser(const QString &userName) const;
|
|
const QMap<QString, Server_ProtocolHandler *> &getUsers() const
|
|
{
|
|
return users;
|
|
}
|
|
const QMap<qint64, Server_ProtocolHandler *> &getUsersBySessionId() const
|
|
{
|
|
return usersBySessionId;
|
|
}
|
|
virtual QMap<QString, bool> getServerRequiredFeatureList() const
|
|
{
|
|
return QMap<QString, bool>();
|
|
}
|
|
void addClient(Server_ProtocolHandler *player);
|
|
void removeClient(Server_ProtocolHandler *player);
|
|
QList<QString> getOnlineModeratorList() const;
|
|
virtual QString getLoginMessage() const
|
|
{
|
|
return QString();
|
|
}
|
|
virtual SessionEvent *getLoginSessionEvent() const
|
|
{
|
|
return nullptr;
|
|
}
|
|
virtual QString getRequiredFeatures() const
|
|
{
|
|
return QString();
|
|
}
|
|
virtual bool permitUnregisteredUsers() const
|
|
{
|
|
return true;
|
|
}
|
|
virtual bool getGameShouldPing() const
|
|
{
|
|
return false;
|
|
}
|
|
virtual bool getClientIDRequiredEnabled() const
|
|
{
|
|
return false;
|
|
}
|
|
virtual bool getRegOnlyServerEnabled() const
|
|
{
|
|
return false;
|
|
}
|
|
virtual bool getMaxUserLimitEnabled() const
|
|
{
|
|
return false;
|
|
}
|
|
virtual bool getEnableLogQuery() const
|
|
{
|
|
return false;
|
|
}
|
|
virtual bool getStoreReplaysEnabled() const
|
|
{
|
|
return true;
|
|
}
|
|
virtual int getIdleClientTimeout() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getClientKeepAlive() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getMaxGameInactivityTime() const
|
|
{
|
|
return 9999999;
|
|
}
|
|
virtual int getMaxPlayerInactivityTime() const
|
|
{
|
|
return 9999999;
|
|
}
|
|
virtual int getMessageCountingInterval() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getMaxMessageCountPerInterval() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getMaxMessageSizePerInterval() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getMaxGamesPerUser() const
|
|
{
|
|
return -1;
|
|
}
|
|
virtual int getCommandCountingInterval() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getMaxCommandCountPerInterval() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual int getMaxUserTotal() const
|
|
{
|
|
return 9999999;
|
|
}
|
|
virtual int getServerID() const
|
|
{
|
|
return 0;
|
|
}
|
|
virtual bool permitCreateGameAsJudge() const
|
|
{
|
|
return false;
|
|
}
|
|
/// Called once per actual game start with how long bringing every player's
|
|
/// zones online took, so servers can spot deck sizes that wedge threads.
|
|
virtual void observeGameStartDurationMs(qint64 /* elapsedMs */)
|
|
{
|
|
}
|
|
|
|
Server_DatabaseInterface *getDatabaseInterface() const;
|
|
int getNextLocalGameId()
|
|
{
|
|
QMutexLocker locker(&nextLocalGameIdMutex);
|
|
return ++nextLocalGameId;
|
|
}
|
|
|
|
void sendIsl_Response(const Response &item, int serverId = -1, qint64 sessionId = -1);
|
|
void sendIsl_SessionEvent(const SessionEvent &item, int serverId = -1, qint64 sessionId = -1);
|
|
void sendIsl_GameEventContainer(const GameEventContainer &item, int serverId = -1, qint64 sessionId = -1);
|
|
void sendIsl_RoomEvent(const RoomEvent &item, int serverId = -1, qint64 sessionId = -1);
|
|
void sendIsl_GameCommand(const CommandContainer &item, int serverId, qint64 sessionId, int roomId, int playerId);
|
|
void sendIsl_RoomCommand(const CommandContainer &item, int serverId, qint64 sessionId, int roomId);
|
|
|
|
const QMap<QString, Server_AbstractUserInterface *> &getExternalUsers() const
|
|
{
|
|
return externalUsers;
|
|
}
|
|
|
|
void addPersistentPlayer(const QString &userName, int roomId, int gameId, int playerId);
|
|
void removePersistentPlayer(const QString &userName, int roomId, int gameId, int playerId);
|
|
QList<PlayerReference> getPersistentPlayerReferences(const QString &userName) const;
|
|
int getUsersCount() const;
|
|
int getGamesCount() const;
|
|
int getTCPUserCount() const
|
|
{
|
|
return tcpUserCount;
|
|
}
|
|
int getWebSocketUserCount() const
|
|
{
|
|
return webSocketUserCount;
|
|
}
|
|
|
|
private:
|
|
QMultiMap<QString, PlayerReference> persistentPlayers;
|
|
mutable QReadWriteLock persistentPlayersLock;
|
|
int nextLocalGameId, tcpUserCount, webSocketUserCount;
|
|
QMutex nextLocalGameIdMutex;
|
|
|
|
protected slots:
|
|
void externalUserJoined(const ServerInfo_User &userInfo);
|
|
void externalUserLeft(const QString &userName);
|
|
void externalRoomUserJoined(int roomId, const ServerInfo_User &userInfo);
|
|
void externalRoomUserLeft(int roomId, const QString &userName);
|
|
void externalRoomSay(int roomId, const QString &userName, const QString &message);
|
|
void externalRoomRemoveMessages(int roomId, const QString &userName, int amount);
|
|
void externalRoomGameListChanged(int roomId, const ServerInfo_Game &gameInfo);
|
|
void
|
|
externalJoinGameCommandReceived(const Command_JoinGame &cmd, int cmdId, int roomId, int serverId, qint64 sessionId);
|
|
void
|
|
externalGameCommandContainerReceived(const CommandContainer &cont, int playerId, int serverId, qint64 sessionId);
|
|
void externalGameEventContainerReceived(const GameEventContainer &cont, qint64 sessionId);
|
|
void externalResponseReceived(const Response &resp, qint64 sessionId);
|
|
|
|
virtual void doSendIslMessage(const IslMessage & /* msg */, int /* serverId */)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
void prepareDestroy();
|
|
void setDatabaseInterface(Server_DatabaseInterface *_databaseInterface);
|
|
QList<Server_ProtocolHandler *> clients;
|
|
QMap<qint64, Server_ProtocolHandler *> usersBySessionId;
|
|
QMap<QString, Server_ProtocolHandler *> users;
|
|
QMap<qint64, Server_AbstractUserInterface *> externalUsersBySessionId;
|
|
QMap<QString, Server_AbstractUserInterface *> externalUsers;
|
|
QMap<int, Server_Room *> rooms;
|
|
QMap<QThread *, Server_DatabaseInterface *> databaseInterfaces;
|
|
void addRoom(Server_Room *newRoom);
|
|
};
|
|
|
|
#endif
|