sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Save more and send less statistics.

Browse Source
This commit is contained in:
lotodore
2008-04-01 21:44:05 +00:00
parent ec449928d5
commit e0be7e9490
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game_defs.h
+3 -2
View File
@@ -81,9 +81,10 @@ enum NetTimeoutReason {
struct ServerStats struct ServerStats
{ {
ServerStats() ServerStats()
: numberOfPlayersOnServer(0), totalPlayersEverLoggedIn(0), totalGamesEverCreated(0), : numberOfPlayersOnServer(0), numberOfGamesOpen(0), totalPlayersEverLoggedIn(0),
maxGamesOpen(0), maxPlayersLoggedIn(0) {} totalGamesEverCreated(0), maxGamesOpen(0), maxPlayersLoggedIn(0) {}
unsigned numberOfPlayersOnServer; unsigned numberOfPlayersOnServer;
unsigned numberOfGamesOpen;
unsigned totalPlayersEverLoggedIn; unsigned totalPlayersEverLoggedIn;
unsigned totalGamesEverCreated; unsigned totalGamesEverCreated;
unsigned maxGamesOpen; unsigned maxGamesOpen;
src/net/common/netpacket.cpp
+10 -8
View File
@@ -4139,13 +4139,15 @@ NetPacketStatisticsChanged::Clone() const
void void
NetPacketStatisticsChanged::SetData(const NetPacketStatisticsChanged::Data &inData) NetPacketStatisticsChanged::SetData(const NetPacketStatisticsChanged::Data &inData)
{ {
u_int16_t numValues = 0; // Only send number of players.
if (inData.stats.numberOfPlayersOnServer) // u_int16_t numValues = 0;
u_int16_t numValues = 1;
/* if (inData.stats.numberOfPlayersOnServer)
++numValues; ++numValues;
if (inData.stats.totalPlayersEverLoggedIn) if (inData.stats.totalPlayersEverLoggedIn)
++numValues; ++numValues;
if (inData.stats.totalGamesEverCreated) if (inData.stats.totalGamesEverCreated)
++numValues; ++numValues;*/
// Resize the packet so that the data fits in. // Resize the packet so that the data fits in.
Resize((u_int16_t) Resize((u_int16_t)
@@ -4158,13 +4160,13 @@ NetPacketStatisticsChanged::SetData(const NetPacketStatisticsChanged::Data &inDa
StatisticsData *curStatisticsData = StatisticsData *curStatisticsData =
(StatisticsData *)((char *)tmpData + sizeof(NetPacketStatisticsChangedData)); (StatisticsData *)((char *)tmpData + sizeof(NetPacketStatisticsChangedData));
if (inData.stats.numberOfPlayersOnServer) // if (inData.stats.numberOfPlayersOnServer)
{ // {
curStatisticsData->statisticsType = htonl(NET_STAT_CUR_PLAYERS_ON_SERVER); curStatisticsData->statisticsType = htonl(NET_STAT_CUR_PLAYERS_ON_SERVER);
curStatisticsData->statisticsValue = htonl(inData.stats.numberOfPlayersOnServer); curStatisticsData->statisticsValue = htonl(inData.stats.numberOfPlayersOnServer);
++curStatisticsData; ++curStatisticsData;
} // }
if (inData.stats.totalPlayersEverLoggedIn) /* if (inData.stats.totalPlayersEverLoggedIn)
{ {
curStatisticsData->statisticsType = htonl(NET_STAT_TOTAL_PLAYERS_EVER_ON_SERVER); curStatisticsData->statisticsType = htonl(NET_STAT_TOTAL_PLAYERS_EVER_ON_SERVER);
curStatisticsData->statisticsValue = htonl(inData.stats.totalPlayersEverLoggedIn); curStatisticsData->statisticsValue = htonl(inData.stats.totalPlayersEverLoggedIn);
@@ -4174,7 +4176,7 @@ NetPacketStatisticsChanged::SetData(const NetPacketStatisticsChanged::Data &inDa
{ {
curStatisticsData->statisticsType = htonl(NET_STAT_TOTAL_GAMES_EVER_ON_SERVER); curStatisticsData->statisticsType = htonl(NET_STAT_TOTAL_GAMES_EVER_ON_SERVER);
curStatisticsData->statisticsValue = htonl(inData.stats.totalGamesEverCreated); curStatisticsData->statisticsValue = htonl(inData.stats.totalGamesEverCreated);
} }*/
// Check the packet - just in case. // Check the packet - just in case.
Check(GetRawData()); Check(GetRawData());
src/net/common/serverlobbythread.cpp
+14
View File
@@ -51,6 +51,8 @@
#define SERVER_STATISTICS_STR_TOTAL_GAMES "TotalNumGamesCreated" #define SERVER_STATISTICS_STR_TOTAL_GAMES "TotalNumGamesCreated"
#define SERVER_STATISTICS_STR_MAX_GAMES "MaxGamesOpen" #define SERVER_STATISTICS_STR_MAX_GAMES "MaxGamesOpen"
#define SERVER_STATISTICS_STR_MAX_PLAYERS "MaxPlayersLoggedIn" #define SERVER_STATISTICS_STR_MAX_PLAYERS "MaxPlayersLoggedIn"
#define SERVER_STATISTICS_STR_CUR_GAMES "CurGamesOpen"
#define SERVER_STATISTICS_STR_CUR_PLAYERS "CurPlayersLoggedIn"
using namespace std; using namespace std;
@@ -879,6 +881,7 @@ ServerLobbyThread::InternalAddGame(boost::shared_ptr<ServerGameThread> game)
{ {
boost::mutex::scoped_lock lock(m_statMutex); boost::mutex::scoped_lock lock(m_statMutex);
++m_statData.totalGamesEverCreated; ++m_statData.totalGamesEverCreated;
++m_statData.numberOfGamesOpen;
unsigned numGames = static_cast<unsigned>(m_gameMap.size()); unsigned numGames = static_cast<unsigned>(m_gameMap.size());
if (numGames > m_statData.maxGamesOpen) if (numGames > m_statData.maxGamesOpen)
m_statData.maxGamesOpen = numGames; m_statData.maxGamesOpen = numGames;
@@ -889,6 +892,14 @@ ServerLobbyThread::InternalAddGame(boost::shared_ptr<ServerGameThread> game)
void void
ServerLobbyThread::InternalRemoveGame(boost::shared_ptr<ServerGameThread> game) ServerLobbyThread::InternalRemoveGame(boost::shared_ptr<ServerGameThread> game)
{ {
{
boost::mutex::scoped_lock lock(m_statMutex);
if (m_statData.numberOfGamesOpen)
{
--m_statData.numberOfGamesOpen;
m_statDataChanged = true;
}
}
// Remove game from list. // Remove game from list.
m_gameMap.erase(game->GetId()); m_gameMap.erase(game->GetId());
// Remove all sessions left in the game. // Remove all sessions left in the game.
@@ -1150,6 +1161,7 @@ ServerLobbyThread::ReadStatisticsFile()
m_statData.maxPlayersLoggedIn = statisticsValue; m_statData.maxPlayersLoggedIn = statisticsValue;
else if (statisticsType == SERVER_STATISTICS_STR_MAX_GAMES) else if (statisticsType == SERVER_STATISTICS_STR_MAX_GAMES)
m_statData.maxGamesOpen = statisticsValue; m_statData.maxGamesOpen = statisticsValue;
// other statistics are non-persistant and not read.
} while (!i.fail() && !i.eof()); } while (!i.fail() && !i.eof());
m_statDataChanged = false; m_statDataChanged = false;
} }
@@ -1172,6 +1184,8 @@ ServerLobbyThread::SaveStatisticsFile()
o << SERVER_STATISTICS_STR_TOTAL_GAMES " " << m_statData.totalGamesEverCreated << endl; o << SERVER_STATISTICS_STR_TOTAL_GAMES " " << m_statData.totalGamesEverCreated << endl;
o << SERVER_STATISTICS_STR_MAX_PLAYERS " " << m_statData.maxPlayersLoggedIn << endl; o << SERVER_STATISTICS_STR_MAX_PLAYERS " " << m_statData.maxPlayersLoggedIn << endl;
o << SERVER_STATISTICS_STR_MAX_GAMES " " << m_statData.maxGamesOpen << endl; o << SERVER_STATISTICS_STR_MAX_GAMES " " << m_statData.maxGamesOpen << endl;
o << SERVER_STATISTICS_STR_CUR_PLAYERS " " << m_statData.numberOfPlayersOnServer << endl;
o << SERVER_STATISTICS_STR_CUR_GAMES " " << m_statData.numberOfGamesOpen << endl;
m_statDataChanged = false; m_statDataChanged = false;
} }
} }