mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Close #12424: Refactor NetworkStatisticsGroup to use strong enum (#13056)

Browse Source
This commit is contained in:
Julia Pinheiro
2020-10-01 22:07:48 -03:00
committed by GitHub
parent 29955f28e0
commit 657106d4c6
4 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2-ui/windows/Network.cpp
View File

@@ -64,8 +64,8 @@ static void window_network_information_paint(rct_window *w, rct_drawpixelinfo *d
struct NetworkHistory_t
{
std::array<uint16_t, NETWORK_STATISTICS_GROUP_MAX> deltaBytesReceived;
std::array<uint16_t, NETWORK_STATISTICS_GROUP_MAX> deltaBytesSent;
std::array<uint16_t, EnumValue(NetworkStatisticsGroup::Max)> deltaBytesReceived;
std::array<uint16_t, EnumValue(NetworkStatisticsGroup::Max)> deltaBytesSent;
};
static NetworkStats_t _networkStats;
@@ -85,14 +85,14 @@ static uint32_t _lastStatsUpdateTime;
static CircularBuffer<NetworkHistory_t, 128> _networkHistory;
static constexpr int32_t NetworkTrafficGroupColors[NETWORK_STATISTICS_GROUP_MAX] = {
static constexpr int32_t NetworkTrafficGroupColors[EnumValue(NetworkStatisticsGroup::Max)] = {
PALETTE_INDEX_21,
PALETTE_INDEX_102,
PALETTE_INDEX_138,
PALETTE_INDEX_171,
};
static constexpr int32_t NetworkTrafficGroupNames[NETWORK_STATISTICS_GROUP_MAX] = {
static constexpr int32_t NetworkTrafficGroupNames[EnumValue(NetworkStatisticsGroup::Max)] = {
STR_NETWORK,
STR_NETWORK_LEGEND_BASE,
STR_NETWORK_LEGEND_COMMANDS,
@@ -219,7 +219,7 @@ static void window_network_information_update(rct_window* w)
float graphTimeElapsed = (currentTicks - _lastGraphUpdateTime) / 1000.0f;
_lastGraphUpdateTime = currentTicks;
for (int i = 0; i < NETWORK_STATISTICS_GROUP_MAX; i++)
for (size_t i = 0; i < EnumValue(NetworkStatisticsGroup::Max); i++)
{
uint32_t deltaBytesReceived = curStats.bytesReceived[i] - _networkStats.bytesReceived[i];
uint32_t deltaBytesSent = curStats.bytesSent[i] - _networkStats.bytesSent[i];
@@ -237,7 +237,7 @@ static void window_network_information_update(rct_window* w)
for (size_t i = 0; i < _networkHistory.size(); i++)
{
const NetworkHistory_t& history = _networkHistory[i];
for (int n = 1; n < NETWORK_STATISTICS_GROUP_MAX; n++)
for (size_t n = 1; n < EnumValue(NetworkStatisticsGroup::Max); n++)
{
graphMaxIn = static_cast<float>(std::max<uint32_t>(history.deltaBytesReceived[n], graphMaxIn));
graphMaxOut = static_cast<float>(std::max<uint32_t>(history.deltaBytesSent[n], graphMaxOut));
@@ -253,8 +253,8 @@ static void window_network_information_update(rct_window* w)
float statsTimeElapsed = (currentTicks - _lastStatsUpdateTime) / 1000.0f;
_lastStatsUpdateTime = currentTicks;
_bytesIn = _networkAccumulatedStats.deltaBytesReceived[NETWORK_STATISTICS_GROUP_TOTAL];
_bytesOut = _networkAccumulatedStats.deltaBytesSent[NETWORK_STATISTICS_GROUP_TOTAL];
_bytesIn = _networkAccumulatedStats.deltaBytesReceived[EnumValue(NetworkStatisticsGroup::Total)];
_bytesOut = _networkAccumulatedStats.deltaBytesSent[EnumValue(NetworkStatisticsGroup::Total)];
_bytesInSec = static_cast<double>(_bytesIn) / statsTimeElapsed;
_bytesOutSec = static_cast<double>(_bytesOut) / statsTimeElapsed;
@@ -321,7 +321,7 @@ static void window_network_draw_graph(
uint32_t curX = std::round((static_cast<float>(i) / static_cast<float>(_networkHistory.capacity())) * barWidth * width);
float totalSum = 0.0f;
for (int n = 1; n < NETWORK_STATISTICS_GROUP_MAX; n++)
for (size_t n = 1; n < EnumValue(NetworkStatisticsGroup::Max); n++)
{
if (received)
totalSum += static_cast<float>(history.deltaBytesReceived[n]);
@@ -330,7 +330,7 @@ static void window_network_draw_graph(
}
int32_t yOffset = height;
for (int n = 1; n < NETWORK_STATISTICS_GROUP_MAX; n++)
for (size_t n = 1; n < EnumValue(NetworkStatisticsGroup::Max); n++)
{
float totalHeight;
float singleHeight;
@@ -391,7 +391,8 @@ static void window_network_information_paint(rct_window* w, rct_drawpixelinfo* d
gfx_draw_string_left(
dpi, STR_NETWORK_TOTAL_RECEIVED, nullptr, PALETTE_INDEX_10, screenCoords + ScreenCoordsXY{ 200, 0 });
format_readable_size(textBuffer, sizeof(textBuffer), _networkStats.bytesReceived[NETWORK_STATISTICS_GROUP_TOTAL]);
format_readable_size(
textBuffer, sizeof(textBuffer), _networkStats.bytesReceived[EnumValue(NetworkStatisticsGroup::Total)]);
gfx_draw_string(dpi, textBuffer, PALETTE_INDEX_10, screenCoords + ScreenCoordsXY(300, 0));
screenCoords.y += textHeight + padding;
@@ -410,7 +411,8 @@ static void window_network_information_paint(rct_window* w, rct_drawpixelinfo* d
gfx_draw_string_left(
dpi, STR_NETWORK_TOTAL_SENT, nullptr, PALETTE_INDEX_10, screenCoords + ScreenCoordsXY{ 200, 0 });
format_readable_size(textBuffer, sizeof(textBuffer), _networkStats.bytesSent[NETWORK_STATISTICS_GROUP_TOTAL]);
format_readable_size(
textBuffer, sizeof(textBuffer), _networkStats.bytesSent[EnumValue(NetworkStatisticsGroup::Total)]);
gfx_draw_string(dpi, textBuffer, PALETTE_INDEX_10, screenCoords + ScreenCoordsXY(300, 0));
screenCoords.y += textHeight + padding;
@@ -421,7 +423,7 @@ static void window_network_information_paint(rct_window* w, rct_drawpixelinfo* d
// Draw legend
{
for (int i = 1; i < NETWORK_STATISTICS_GROUP_MAX; i++)
for (size_t i = 1; i < EnumValue(NetworkStatisticsGroup::Max); i++)
{
format_string(textBuffer, sizeof(textBuffer), NetworkTrafficGroupNames[i], nullptr);

2
src/openrct2/network/NetworkBase.cpp
View File

@@ -1333,7 +1333,7 @@ NetworkStats_t NetworkBase::GetStats() const
{
for (auto& connection : client_connection_list)
{
for (size_t n = 0; n < NETWORK_STATISTICS_GROUP_MAX; n++)
for (size_t n = 0; n < EnumValue(NetworkStatisticsGroup::Max); n++)
{
stats.bytesReceived[n] += connection->Stats.bytesReceived[n];
stats.bytesSent[n] += connection->Stats.bytesSent[n];

16
src/openrct2/network/NetworkConnection.cpp
View File

@@ -210,30 +210,30 @@ void NetworkConnection::SetLastDisconnectReason(const rct_string_id string_id, v
void NetworkConnection::RecordPacketStats(const NetworkPacket& packet, bool sending)
{
uint32_t packetSize = static_cast<uint32_t>(packet.BytesTransferred);
uint32_t trafficGroup;
NetworkStatisticsGroup trafficGroup;
switch (packet.GetCommand())
{
case NetworkCommand::GameAction:
trafficGroup = NETWORK_STATISTICS_GROUP_COMMANDS;
trafficGroup = NetworkStatisticsGroup::Commands;
break;
case NetworkCommand::Map:
trafficGroup = NETWORK_STATISTICS_GROUP_MAPDATA;
trafficGroup = NetworkStatisticsGroup::MapData;
break;
default:
trafficGroup = NETWORK_STATISTICS_GROUP_BASE;
trafficGroup = NetworkStatisticsGroup::Base;
break;
}
if (sending)
{
Stats.bytesSent[trafficGroup] += packetSize;
Stats.bytesSent[NETWORK_STATISTICS_GROUP_TOTAL] += packetSize;
Stats.bytesSent[EnumValue(trafficGroup)] += packetSize;
Stats.bytesSent[EnumValue(NetworkStatisticsGroup::Total)] += packetSize;
}
else
{
Stats.bytesReceived[trafficGroup] += packetSize;
Stats.bytesReceived[NETWORK_STATISTICS_GROUP_TOTAL] += packetSize;
Stats.bytesReceived[EnumValue(trafficGroup)] += packetSize;
Stats.bytesReceived[EnumValue(NetworkStatisticsGroup::Total)] += packetSize;
}
}

17
src/openrct2/network/NetworkTypes.h
View File

@@ -12,6 +12,7 @@
#include "../common.h"
#include "../core/Endianness.h"
#include "../ride/RideTypes.h"
#include "../util/Util.h"
enum
{
@@ -131,17 +132,17 @@ using NetworkPlayerId_t = NetworkObjectId_t<int32_t, 0>;
using NetworkRideId_t = NetworkObjectId_t<ride_id_t, 1>;
using NetworkCheatType_t = NetworkObjectId_t<int32_t, 2>;
enum NetworkStatisticsGroup
enum class NetworkStatisticsGroup : uint32_t
{
NETWORK_STATISTICS_GROUP_TOTAL = 0, // Entire network traffic.
NETWORK_STATISTICS_GROUP_BASE, // Messages such as Tick, Ping
NETWORK_STATISTICS_GROUP_COMMANDS, // Command / Game actions
NETWORK_STATISTICS_GROUP_MAPDATA,
NETWORK_STATISTICS_GROUP_MAX,
Total = 0, // Entire network traffic.
Base, // Messages such as Tick, Ping
Commands, // Command / Game actions
MapData,
Max,
};
struct NetworkStats_t
{
uint64_t bytesReceived[NETWORK_STATISTICS_GROUP_MAX];
uint64_t bytesSent[NETWORK_STATISTICS_GROUP_MAX];
uint64_t bytesReceived[EnumValue(NetworkStatisticsGroup::Max)];
uint64_t bytesSent[EnumValue(NetworkStatisticsGroup::Max)];
};