mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 17:15:09 -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>
293 lines
14 KiB
C++
293 lines
14 KiB
C++
/***************************************************************************
|
|
* Copyright (C) 2008 by Max-Wilhelm Bruker *
|
|
* brukie@laptop *
|
|
* *
|
|
* This program 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. *
|
|
* *
|
|
* This program 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 this program; if not, write to the *
|
|
* Free Software Foundation, Inc., *
|
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
|
***************************************************************************/
|
|
#ifndef SERVERSOCKETINTERFACE_H
|
|
#define SERVERSOCKETINTERFACE_H
|
|
|
|
#include <QHostAddress>
|
|
#include <QMutex>
|
|
#include <QTcpSocket>
|
|
#include <QWebSocket>
|
|
#include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_replay_download_by_game_id.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_assign.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_details.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_list.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_my_list.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_resolve.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_stats.pb.h>
|
|
#include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
|
|
#include <server_protocolhandler.h>
|
|
|
|
class Servatrice;
|
|
class Servatrice_DatabaseInterface;
|
|
class DeckList;
|
|
class ServerInfo_DeckStorage_Folder;
|
|
|
|
class Command_AddToList;
|
|
class Command_RemoveFromList;
|
|
class Command_DeckList;
|
|
class Command_DeckNewDir;
|
|
class Command_DeckDelDir;
|
|
class Command_DeckDel;
|
|
class Command_DeckDownload;
|
|
class Command_DeckUpload;
|
|
class Command_ReplayList;
|
|
class Command_ReplayDownload;
|
|
class Command_ReplayModifyMatch;
|
|
class Command_ReplayDeleteMatch;
|
|
class Command_ReplayGetCode;
|
|
class Command_ReplaySubmitCode;
|
|
|
|
class Command_BanFromServer;
|
|
class Command_UpdateServerMessage;
|
|
class Command_ShutdownServer;
|
|
class Command_ReloadConfig;
|
|
class Command_ReplayDownloadByGameId;
|
|
|
|
class Command_AccountEdit;
|
|
class Command_AccountImage;
|
|
class Command_AccountPassword;
|
|
|
|
class AbstractServerSocketInterface : public Server_ProtocolHandler
|
|
{
|
|
Q_OBJECT
|
|
protected slots:
|
|
void catchSocketError(QAbstractSocket::SocketError socketError);
|
|
void catchSocketDisconnected();
|
|
virtual void flushOutputQueue() = 0;
|
|
signals:
|
|
void outputQueueChanged();
|
|
void incTxBytes(qint64 amount);
|
|
|
|
protected:
|
|
void logDebugMessage(const QString &message) override;
|
|
bool tooManyRegistrationAttempts(const QString &ipAddress);
|
|
void processCommandContainer(const CommandContainer &cont) override;
|
|
|
|
virtual void writeToSocket(QByteArray &data) = 0;
|
|
virtual void flushSocket() = 0;
|
|
|
|
Servatrice *servatrice;
|
|
QList<ServerMessage> outputQueue;
|
|
QMutex outputQueueMutex;
|
|
|
|
private:
|
|
Servatrice_DatabaseInterface *sqlInterface;
|
|
|
|
Response::ResponseCode cmdAddToList(const Command_AddToList &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdRemoveFromList(const Command_RemoveFromList &cmd, ResponseContainer &rc);
|
|
int getDeckPathId(int basePathId, QStringList path);
|
|
int getDeckPathId(const QString &path);
|
|
bool deckListHelper(int folderId, ServerInfo_DeckStorage_Folder *folder);
|
|
Response::ResponseCode cmdDeckList(const Command_DeckList &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdDeckNewDir(const Command_DeckNewDir &cmd, ResponseContainer &rc);
|
|
void deckDelDirHelper(int basePathId);
|
|
void sendServerMessage(const QString userName, const QString message);
|
|
Response::ResponseCode cmdDeckDelDir(const Command_DeckDelDir &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdDeckDel(const Command_DeckDel &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdDeckUpload(const Command_DeckUpload &cmd, ResponseContainer &rc);
|
|
DeckList *getDeckFromDatabase(int deckId);
|
|
Response::ResponseCode cmdDeckDownload(const Command_DeckDownload &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReplayList(const Command_ReplayList &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReplayDownload(const Command_ReplayDownload &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReplayModifyMatch(const Command_ReplayModifyMatch &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReplayDeleteMatch(const Command_ReplayDeleteMatch &cmd, ResponseContainer &rc);
|
|
QString createHashForReplay(int gameId);
|
|
Response::ResponseCode cmdReplayGetCode(const Command_ReplayGetCode &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReplaySubmitCode(const Command_ReplaySubmitCode &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdBanFromServer(const Command_BanFromServer &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReportList(const Command_ReportList &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdWarnUser(const Command_WarnUser &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode
|
|
cmdGetLogHistory(const Command_ViewLogHistory &cmd, ResponseContainer &rc, bool allowPrivateChat);
|
|
Response::ResponseCode cmdGetBanHistory(const Command_GetBanHistory &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdGetWarnList(const Command_GetWarnList &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdGetWarnHistory(const Command_GetWarnHistory &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdShutdownServer(const Command_ShutdownServer &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdUpdateServerMessage(const Command_UpdateServerMessage &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReportAssign(const Command_ReportAssign &cmd, ResponseContainer &);
|
|
Response::ResponseCode cmdReportResolve(const Command_ReportResolve &cmd, ResponseContainer &);
|
|
Response::ResponseCode cmdReportUserInfo(const Command_ReportUserInfo &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReportStats(const Command_ReportStats &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdRegisterAccount(const Command_Register &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdActivateAccount(const Command_Activate &cmd, ResponseContainer & /* rc */);
|
|
Response::ResponseCode cmdReloadConfig(const Command_ReloadConfig & /* cmd */, ResponseContainer & /*rc*/);
|
|
Response::ResponseCode cmdAdjustMod(const Command_AdjustMod &cmd, ResponseContainer & /*rc*/);
|
|
Response::ResponseCode cmdForgotPasswordRequest(const Command_ForgotPasswordRequest &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode continuePasswordRequest(const QString &userName,
|
|
const QString &clientId,
|
|
ResponseContainer &rc,
|
|
bool challenged = false);
|
|
Response::ResponseCode cmdForgotPasswordReset(const Command_ForgotPasswordReset &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdForgotPasswordChallenge(const Command_ForgotPasswordChallenge &cmd,
|
|
ResponseContainer &rc);
|
|
Response::ResponseCode cmdRequestPasswordSalt(const Command_RequestPasswordSalt &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReport(const Command_Report &cmd, ResponseContainer &);
|
|
Response::ResponseCode cmdReportMyList(const Command_ReportMyList &cmd, ResponseContainer &rc);
|
|
void sendPendingReportNotifications(ResponseContainer &rc);
|
|
void onLogin(ResponseContainer &rc) override;
|
|
Response::ResponseCode cmdReportDetails(const Command_ReportDetails &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReportAddComment(const Command_ReportAddComment &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdReplayDownloadByGameId(const Command_ReplayDownloadByGameId &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode
|
|
processExtendedSessionCommand(int cmdType, const SessionCommand &cmd, ResponseContainer &rc) override;
|
|
Response::ResponseCode
|
|
processExtendedModeratorCommand(int cmdType, const ModeratorCommand &cmd, ResponseContainer &rc) override;
|
|
Response::ResponseCode
|
|
processExtendedAdminCommand(int cmdType, const AdminCommand &cmd, ResponseContainer &rc) override;
|
|
Response::ResponseCode
|
|
processExtendedDeveloperCommand(int cmdType, const DeveloperCommand &cmd, ResponseContainer &rc) override;
|
|
|
|
Response::ResponseCode cmdAccountEdit(const Command_AccountEdit &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdAccountImage(const Command_AccountImage &cmd, ResponseContainer &rc);
|
|
bool isCardNameAllowed(const QString &cardName, const QString &cardProviderId);
|
|
Response::ResponseCode cmdSetCardArtParams(const Command_SetCardArtParams &cmd, ResponseContainer &);
|
|
Response::ResponseCode cmdAddCardArtRule(const Command_AddCardArtRule &cmd, ResponseContainer &);
|
|
Response::ResponseCode cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd, ResponseContainer &);
|
|
Response::ResponseCode cmdListCardArtRules(const Command_ListCardArtRules &, ResponseContainer &rc);
|
|
Response::ResponseCode cmdAccountPassword(const Command_AccountPassword &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdGrantReplayAccess(const Command_GrantReplayAccess &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdForceActivateUser(const Command_ForceActivateUser &cmd, ResponseContainer &rc);
|
|
|
|
Response::ResponseCode cmdGetAdminNotes(const Command_GetAdminNotes &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdUpdateAdminNotes(const Command_UpdateAdminNotes &cmd, ResponseContainer &rc);
|
|
|
|
Response::ResponseCode cmdGetUserSessions(const Command_GetUserSessions &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdGetUserAlts(const Command_GetUserAlts &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdGetModeratorLastLogins(const Command_GetModeratorLastLogins &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdResetUserPassword(const Command_ResetUserPassword &cmd, ResponseContainer &rc);
|
|
Response::ResponseCode cmdRemoveUserAvatar(const Command_RemoveUserAvatar &cmd, ResponseContainer &rc);
|
|
|
|
Response::ResponseCode cmdGetServerStats(const Command_GetServerStats &cmd, ResponseContainer &rc);
|
|
|
|
bool addAdminFlagToUser(const QString &user, int flag);
|
|
bool removeAdminFlagFromUser(const QString &user, int flag);
|
|
|
|
bool isPasswordLongEnough(const int passwordLength);
|
|
void removeSaidMessages(const QString &userName, int amount);
|
|
|
|
public:
|
|
AbstractServerSocketInterface(Servatrice *_server,
|
|
Servatrice_DatabaseInterface *_databaseInterface,
|
|
QObject *parent = 0);
|
|
~AbstractServerSocketInterface()
|
|
{
|
|
}
|
|
bool initSession();
|
|
|
|
virtual QHostAddress getPeerAddress() const = 0;
|
|
QString getAddress() const override = 0;
|
|
|
|
void transmitProtocolItem(const ServerMessage &item) override;
|
|
};
|
|
|
|
class TcpServerSocketInterface : public AbstractServerSocketInterface
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
TcpServerSocketInterface(Servatrice *_server,
|
|
Servatrice_DatabaseInterface *_databaseInterface,
|
|
QObject *parent = 0);
|
|
~TcpServerSocketInterface();
|
|
|
|
QHostAddress getPeerAddress() const
|
|
{
|
|
return socket->peerAddress();
|
|
}
|
|
QString getAddress() const
|
|
{
|
|
return socket->peerAddress().toString();
|
|
}
|
|
QString getConnectionType() const
|
|
{
|
|
return "tcp";
|
|
}
|
|
|
|
private:
|
|
QTcpSocket *socket;
|
|
QByteArray inputBuffer;
|
|
bool messageInProgress;
|
|
bool handshakeStarted;
|
|
int messageLength;
|
|
|
|
protected:
|
|
void writeToSocket(QByteArray &data)
|
|
{
|
|
socket->write(data);
|
|
}
|
|
void flushSocket()
|
|
{
|
|
socket->flush();
|
|
}
|
|
void initSessionDeprecated();
|
|
bool initTcpSession();
|
|
protected slots:
|
|
void readClient();
|
|
void flushOutputQueue();
|
|
public slots:
|
|
void initConnection(int socketDescriptor);
|
|
};
|
|
|
|
class WebsocketServerSocketInterface : public AbstractServerSocketInterface
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
WebsocketServerSocketInterface(Servatrice *_server,
|
|
Servatrice_DatabaseInterface *_databaseInterface,
|
|
QObject *parent = nullptr);
|
|
~WebsocketServerSocketInterface();
|
|
|
|
QHostAddress getPeerAddress() const
|
|
{
|
|
return address;
|
|
}
|
|
QString getAddress() const
|
|
{
|
|
return address.toString();
|
|
}
|
|
QString getConnectionType() const
|
|
{
|
|
return "websocket";
|
|
}
|
|
|
|
private:
|
|
QWebSocket *socket;
|
|
QHostAddress address;
|
|
|
|
protected:
|
|
void writeToSocket(QByteArray &data)
|
|
{
|
|
socket->sendBinaryMessage(data);
|
|
}
|
|
void flushSocket()
|
|
{
|
|
socket->flush();
|
|
}
|
|
bool initWebsocketSession();
|
|
protected slots:
|
|
void binaryMessageReceived(const QByteArray &message);
|
|
void flushOutputQueue();
|
|
public slots:
|
|
void initConnection(void *_socket);
|
|
};
|
|
|
|
#endif
|