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

Rewriting boost asio timer stuff. (Did I mention I dislike the asio "cancel" semantics?!). TimerManager is no longer used. Should be stable now, but might leak some memory (needs further testing).

Browse Source
This commit is contained in:
lotodore
2009-06-12 15:48:34 +00:00
parent a33d9b7c3b
commit 3b25e18fde
6 changed files with 681 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergame.cpp
+89 -84
View File
@@ -38,10 +38,10 @@
using namespace std; using namespace std;
ServerGame::ServerGame(ServerLobbyThread &lobbyThread, u_int32_t id, const string &name, const string &pwd, const GameData &gameData, unsigned adminPlayerId, GuiInterface &gui, ConfigFile *playerConfig) ServerGame::ServerGame(boost::shared_ptr<ServerLobbyThread> lobbyThread, u_int32_t id, const string &name, const string &pwd, const GameData &gameData, unsigned adminPlayerId, GuiInterface &gui, ConfigFile *playerConfig)
: m_adminPlayerId(adminPlayerId), m_lobbyThread(lobbyThread), m_gui(gui), : m_adminPlayerId(adminPlayerId), m_lobbyThread(lobbyThread), m_gui(gui),
m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name), m_password(pwd), m_playerConfig(playerConfig), m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name), m_password(pwd), m_playerConfig(playerConfig),
m_gameNum(1), m_curPetitionId(1), m_stateTimerId(0) m_gameNum(1), m_curPetitionId(1), m_voteKickTimer(lobbyThread->GetIOService()), m_stateTimer(lobbyThread->GetIOService())
{ {
LOG_VERBOSE("Game object " << GetId() << " created."); LOG_VERBOSE("Game object " << GetId() << " created.");
@@ -56,10 +56,11 @@ ServerGame::~ServerGame()
void void
ServerGame::Init() ServerGame::Init()
{ {
m_voteKickTimerId = GetLobbyThread().GetTimerManager().RegisterTimer( m_voteKickTimer.expires_from_now(
SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC, boost::posix_time::milliseconds(SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC));
boost::bind(&ServerGame::TimerVoteKick, this), m_voteKickTimer.async_wait(
true); boost::bind(
&ServerGame::TimerVoteKick, shared_from_this(), boost::asio::placeholders::error));
SetState(SERVER_INITIAL_STATE::Instance()); SetState(SERVER_INITIAL_STATE::Instance());
} }
@@ -67,8 +68,9 @@ ServerGame::Init()
void void
ServerGame::Exit() ServerGame::Exit()
{ {
GetLobbyThread().GetTimerManager().UnregisterTimer(m_voteKickTimerId); m_voteKickTimer.cancel();
GetLobbyThread().GetTimerManager().UnregisterTimer(m_stateTimerId); if (m_curState)
m_curState->Exit(shared_from_this());
} }
u_int32_t u_int32_t
@@ -87,7 +89,7 @@ void
ServerGame::AddSession(SessionWrapper session) ServerGame::AddSession(SessionWrapper session)
{ {
if (session.sessionData) if (session.sessionData)
GetState().HandleNewSession(*this, session); GetState().HandleNewSession(shared_from_this(), session);
} }
void void
@@ -103,7 +105,7 @@ void
ServerGame::HandlePacket(SessionWrapper session, boost::shared_ptr<NetPacket> packet) ServerGame::HandlePacket(SessionWrapper session, boost::shared_ptr<NetPacket> packet)
{ {
if (session.sessionData && packet) if (session.sessionData && packet)
GetState().ProcessPacket(*this, session, packet); GetState().ProcessPacket(shared_from_this(), session, packet);
} }
GameState GameState
@@ -123,77 +125,85 @@ ServerGame::RemoveAllSessions()
{ {
// Called from lobby thread. // Called from lobby thread.
// Clean up ALL sessions which are left. // Clean up ALL sessions which are left.
GetSessionManager().ForEach(boost::bind(&ServerLobbyThread::RemoveSessionFromGame, boost::ref(m_lobbyThread), _1)); GetSessionManager().ForEach(boost::bind(&ServerLobbyThread::RemoveSessionFromGame, boost::ref(*m_lobbyThread), _1));
} }
void void
ServerGame::TimerVoteKick() ServerGame::TimerVoteKick(const boost::system::error_code &ec)
{ {
// Check whether someone should be kicked, or whether a vote kick should be aborted. if (!ec)
// Only one vote kick can be active at a time.
if (m_voteKickData)
{ {
// Prepare some values. // Check whether someone should be kicked, or whether a vote kick should be aborted.
const PlayerIdList playerIds(GetPlayerIdList()); // Only one vote kick can be active at a time.
int votesRequiredToKick = m_voteKickData->numVotesToKick - m_voteKickData->numVotesInFavourOfKicking; if (m_voteKickData)
int playersAllowedToVote = 0;
// We need to count the number of players which are still allowed to vote.
PlayerIdList::const_iterator player_i = playerIds.begin();
PlayerIdList::const_iterator player_end = playerIds.end();
while (player_i != player_end)
{ {
if (find(m_voteKickData->votedPlayerIds.begin(), m_voteKickData->votedPlayerIds.end(), *player_i) == m_voteKickData->votedPlayerIds.end()) // Prepare some values.
playersAllowedToVote++; const PlayerIdList playerIds(GetPlayerIdList());
++player_i; int votesRequiredToKick = m_voteKickData->numVotesToKick - m_voteKickData->numVotesInFavourOfKicking;
} int playersAllowedToVote = 0;
bool abortPetition = false; // We need to count the number of players which are still allowed to vote.
bool doKick = false; PlayerIdList::const_iterator player_i = playerIds.begin();
EndPetitionReason reason; PlayerIdList::const_iterator player_end = playerIds.end();
while (player_i != player_end)
{
if (find(m_voteKickData->votedPlayerIds.begin(), m_voteKickData->votedPlayerIds.end(), *player_i) == m_voteKickData->votedPlayerIds.end())
playersAllowedToVote++;
++player_i;
}
bool abortPetition = false;
bool doKick = false;
EndPetitionReason reason;
// 1. Enough votes to kick the player. // 1. Enough votes to kick the player.
if (m_voteKickData->numVotesInFavourOfKicking >= m_voteKickData->numVotesToKick) if (m_voteKickData->numVotesInFavourOfKicking >= m_voteKickData->numVotesToKick)
{ {
reason = PETITION_END_ENOUGH_VOTES; reason = PETITION_END_ENOUGH_VOTES;
abortPetition = true; abortPetition = true;
doKick = true; doKick = true;
} }
// 2. Several players left the game, so a kick is no longer possible. // 2. Several players left the game, so a kick is no longer possible.
else if (votesRequiredToKick > playersAllowedToVote) else if (votesRequiredToKick > playersAllowedToVote)
{ {
reason = PETITION_END_NOT_ENOUGH_PLAYERS; reason = PETITION_END_NOT_ENOUGH_PLAYERS;
abortPetition = true; abortPetition = true;
} }
// 3. The kick has become invalid because the player to be kicked left. // 3. The kick has become invalid because the player to be kicked left.
else if (!IsValidPlayer(m_voteKickData->kickPlayerId)) else if (!IsValidPlayer(m_voteKickData->kickPlayerId))
{ {
reason = PETITION_END_PLAYER_LEFT; reason = PETITION_END_PLAYER_LEFT;
abortPetition = true; abortPetition = true;
} }
// 4. A kick request timed out (because not everyone voted). // 4. A kick request timed out (because not everyone voted).
else if (m_voteKickData->voteTimer.elapsed().total_seconds() >= m_voteKickData->timeLimitSec) else if (m_voteKickData->voteTimer.elapsed().total_seconds() >= m_voteKickData->timeLimitSec)
{ {
reason = PETITION_END_TIMEOUT; reason = PETITION_END_TIMEOUT;
abortPetition = true; abortPetition = true;
} }
if (abortPetition) if (abortPetition)
{ {
boost::shared_ptr<NetPacket> endPetition(new NetPacketEndKickPlayerPetition); boost::shared_ptr<NetPacket> endPetition(new NetPacketEndKickPlayerPetition);
NetPacketEndKickPlayerPetition::Data endPetitionData; NetPacketEndKickPlayerPetition::Data endPetitionData;
endPetitionData.petitionId = m_voteKickData->petitionId; endPetitionData.petitionId = m_voteKickData->petitionId;
endPetitionData.numVotesAgainstKicking = m_voteKickData->numVotesAgainstKicking; endPetitionData.numVotesAgainstKicking = m_voteKickData->numVotesAgainstKicking;
endPetitionData.numVotesInFavourOfKicking = m_voteKickData->numVotesInFavourOfKicking; endPetitionData.numVotesInFavourOfKicking = m_voteKickData->numVotesInFavourOfKicking;
endPetitionData.playerKicked = doKick; endPetitionData.playerKicked = doKick;
endPetitionData.endReason = reason; endPetitionData.endReason = reason;
static_cast<NetPacketEndKickPlayerPetition *>(endPetition.get())->SetData(endPetitionData); static_cast<NetPacketEndKickPlayerPetition *>(endPetition.get())->SetData(endPetitionData);
SendToAllPlayers(endPetition, SessionData::Game); SendToAllPlayers(endPetition, SessionData::Game);
// Perform kick. // Perform kick.
if (doKick) if (doKick)
InternalKickPlayer(m_voteKickData->kickPlayerId); InternalKickPlayer(m_voteKickData->kickPlayerId);
// This petition has ended. // This petition has ended.
m_voteKickData.reset(); m_voteKickData.reset();
}
} }
m_voteKickTimer.expires_from_now(
boost::posix_time::milliseconds(SERVER_CHECK_VOTE_KICK_INTERVAL_MSEC));
m_voteKickTimer.async_wait(
boost::bind(
&ServerGame::TimerVoteKick, shared_from_this(), boost::asio::placeholders::error));
} }
} }
@@ -545,7 +555,7 @@ ServerGame::RemovePlayerData(boost::shared_ptr<PlayerData> player, int reason)
SetAdminPlayerId(newAdmin->GetUniqueId()); SetAdminPlayerId(newAdmin->GetUniqueId());
newAdmin->SetRights(PLAYER_RIGHTS_ADMIN); newAdmin->SetRights(PLAYER_RIGHTS_ADMIN);
// Notify game state on admin change // Notify game state on admin change
GetState().NotifyGameAdminChanged(*this); GetState().NotifyGameAdminChanged(shared_from_this());
// Send "Game Admin Changed" to clients. // Send "Game Admin Changed" to clients.
boost::shared_ptr<NetPacket> adminChanged(new NetPacketGameAdminChanged); boost::shared_ptr<NetPacket> adminChanged(new NetPacketGameAdminChanged);
NetPacketGameAdminChanged::Data adminChangedData; NetPacketGameAdminChanged::Data adminChangedData;
@@ -666,7 +676,8 @@ ServerGame::GetSessionManager() const
ServerLobbyThread & ServerLobbyThread &
ServerGame::GetLobbyThread() ServerGame::GetLobbyThread()
{ {
return m_lobbyThread; assert(m_lobbyThread);
return *m_lobbyThread;
} }
ServerCallback & ServerCallback &
@@ -686,21 +697,15 @@ void
ServerGame::SetState(ServerGameState &newState) ServerGame::SetState(ServerGameState &newState)
{ {
if (m_curState) if (m_curState)
m_curState->Exit(*this); m_curState->Exit(shared_from_this());
m_curState = &newState; m_curState = &newState;
m_curState->Enter(*this); m_curState->Enter(shared_from_this());
} }
unsigned boost::asio::deadline_timer &
ServerGame::GetStateTimerId() const ServerGame::GetStateTimer()
{ {
return m_stateTimerId; return m_stateTimer;
}
void
ServerGame::SetStateTimerId(unsigned newTimerId)
{
m_stateTimerId = newTimerId;
} }
ReceiverHelper & ReceiverHelper &
src/net/common/servergamestate.cpp
+394 -360
View File
File diff suppressed because it is too large Load Diff
src/net/common/serverlobbythread.cpp
+133 -93
View File
@@ -89,9 +89,12 @@ private:
ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager, ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager,
boost::shared_ptr<boost::asio::io_service> ioService) boost::shared_ptr<boost::asio::io_service> ioService)
: m_ioService(ioService), m_timerManager(ioService), m_curBanId(0), m_gui(gui), m_avatarManager(avatarManager), : m_ioService(ioService), m_curBanId(0), m_gui(gui), m_avatarManager(avatarManager),
m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1), m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1),
m_statDataChanged(false), m_startTime(boost::posix_time::second_clock::local_time()) m_statDataChanged(false), m_removeGameTimer(*ioService), m_removePlayerTimer(*ioService),
m_sessionTimeoutTimer(*ioService), m_avatarCleanupTimer(*ioService),
m_saveStatisticsTimer(*ioService), m_avatarLockTimer(*ioService),
m_startTime(boost::posix_time::second_clock::local_time())
{ {
m_senderCallback.reset(new ServerSenderCallback(*this)); m_senderCallback.reset(new ServerSenderCallback(*this));
m_sender.reset(new SenderHelper(*m_senderCallback, m_ioService)); m_sender.reset(new SenderHelper(*m_senderCallback, m_ioService));
@@ -449,12 +452,6 @@ ServerLobbyThread::RemoveComputerPlayer(boost::shared_ptr<PlayerData> player)
m_computerPlayers.erase(player->GetUniqueId()); m_computerPlayers.erase(player->GetUniqueId());
} }
TimerManager &
ServerLobbyThread::GetTimerManager()
{
return m_timerManager;
}
AvatarManager & AvatarManager &
ServerLobbyThread::GetAvatarManager() ServerLobbyThread::GetAvatarManager()
{ {
@@ -481,6 +478,13 @@ ServerLobbyThread::GetSender()
return *m_sender; return *m_sender;
} }
boost::asio::io_service &
ServerLobbyThread::GetIOService()
{
assert(m_ioService);
return *m_ioService;
}
u_int32_t u_int32_t
ServerLobbyThread::GetNextUniquePlayerId() ServerLobbyThread::GetNextUniquePlayerId()
{ {
@@ -505,11 +509,10 @@ ServerLobbyThread::GetNextGameId()
void void
ServerLobbyThread::Main() ServerLobbyThread::Main()
{ {
// Register all timers.
RegisterTimers();
try try
{ {
// Register all timers.
RegisterTimers();
m_work.reset(new boost::asio::io_service::work(*m_ioService)); m_work.reset(new boost::asio::io_service::work(*m_ioService));
m_ioService->run(); // Will only be aborted asynchronously. m_ioService->run(); // Will only be aborted asynchronously.
m_work.reset(); m_work.reset();
@@ -525,41 +528,60 @@ ServerLobbyThread::Main()
GetCallback().SignalNetServerError(e.GetErrorId(), e.GetOsErrorCode()); GetCallback().SignalNetServerError(e.GetErrorId(), e.GetOsErrorCode());
LOG_ERROR(e.what()); LOG_ERROR(e.what());
} }
// Cancel pending timer callbacks.
CancelTimers();
} }
void void
ServerLobbyThread::RegisterTimers() ServerLobbyThread::RegisterTimers()
{ {
// Remove closed games. // Remove closed games.
m_timerManager.RegisterTimer( m_removeGameTimer.expires_from_now(
SERVER_REMOVE_GAME_INTERVAL_MSEC, boost::posix_time::milliseconds(SERVER_REMOVE_GAME_INTERVAL_MSEC));
boost::bind(&ServerLobbyThread::TimerRemoveGame, this), m_removeGameTimer.async_wait(
true); boost::bind(
&ServerLobbyThread::TimerRemoveGame, shared_from_this(), boost::asio::placeholders::error));
// Remove inactive/kicked players. // Remove inactive/kicked players.
m_timerManager.RegisterTimer( m_removePlayerTimer.expires_from_now(
SERVER_REMOVE_PLAYER_INTERVAL_MSEC, boost::posix_time::milliseconds(SERVER_REMOVE_PLAYER_INTERVAL_MSEC));
boost::bind(&ServerLobbyThread::TimerRemovePlayer, this), m_removePlayerTimer.async_wait(
true); boost::bind(
&ServerLobbyThread::TimerRemovePlayer, shared_from_this(), boost::asio::placeholders::error));
// Check the timeout of sessions which have not been initialised. // Check the timeout of sessions which have not been initialised.
m_timerManager.RegisterTimer( m_sessionTimeoutTimer.expires_from_now(
SERVER_CHECK_SESSION_TIMEOUTS_INTERVAL_MSEC, boost::posix_time::milliseconds(SERVER_CHECK_SESSION_TIMEOUTS_INTERVAL_MSEC));
boost::bind(&ServerLobbyThread::TimerCheckSessionTimeouts, this), m_sessionTimeoutTimer.async_wait(
true); boost::bind(
&ServerLobbyThread::TimerCheckSessionTimeouts, shared_from_this(), boost::asio::placeholders::error));
// Cleanup the avatar cache. Note: Only works if there are no users on the server. // Cleanup the avatar cache. Note: Only works if there are no users on the server.
m_timerManager.RegisterTimer( m_avatarCleanupTimer.expires_from_now(
SERVER_CACHE_CLEANUP_INTERVAL_SEC * 1000, boost::posix_time::seconds(SERVER_CACHE_CLEANUP_INTERVAL_SEC));
boost::bind(&ServerLobbyThread::TimerCleanupAvatarCache, this), m_avatarCleanupTimer.async_wait(
true); boost::bind(
&ServerLobbyThread::TimerCleanupAvatarCache, shared_from_this(), boost::asio::placeholders::error));
// Update the statistics file. // Update the statistics file.
m_timerManager.RegisterTimer( m_saveStatisticsTimer.expires_from_now(
SERVER_SAVE_STATISTICS_INTERVAL_SEC * 1000, boost::posix_time::seconds(SERVER_SAVE_STATISTICS_INTERVAL_SEC));
boost::bind(&ServerLobbyThread::TimerSaveStatisticsFile, this), m_saveStatisticsTimer.async_wait(
true); boost::bind(
&ServerLobbyThread::TimerSaveStatisticsFile, shared_from_this(), boost::asio::placeholders::error));
// Update the avatar upload locks. // Update the avatar upload locks.
m_timerManager.RegisterTimer( m_avatarLockTimer.expires_from_now(
SERVER_UPDATE_AVATAR_LOCK_INTERVAL_MSEC, boost::posix_time::milliseconds(SERVER_UPDATE_AVATAR_LOCK_INTERVAL_MSEC));
boost::bind(&ServerLobbyThread::TimerUpdateClientAvatarLock, this), m_avatarLockTimer.async_wait(
true); boost::bind(
&ServerLobbyThread::TimerUpdateClientAvatarLock, shared_from_this(), boost::asio::placeholders::error));
}
void
ServerLobbyThread::CancelTimers()
{
m_removeGameTimer.cancel();
m_removePlayerTimer.cancel();
m_sessionTimeoutTimer.cancel();
m_avatarCleanupTimer.cancel();
m_saveStatisticsTimer.cancel();
m_avatarLockTimer.cancel();
} }
void void
@@ -941,7 +963,7 @@ ServerLobbyThread::HandleNetPacketCreateGame(SessionWrapper session, const NetPa
boost::shared_ptr<ServerGame> game( boost::shared_ptr<ServerGame> game(
new ServerGame( new ServerGame(
*this, shared_from_this(),
GetNextGameId(), GetNextGameId(),
createGameData.gameName, createGameData.gameName,
createGameData.password, createGameData.password,
@@ -1032,75 +1054,90 @@ ServerLobbyThread::RequestPlayerAvatar(SessionWrapper session)
} }
void void
ServerLobbyThread::TimerRemoveGame() ServerLobbyThread::TimerRemoveGame(const boost::system::error_code &ec)
{ {
// Synchronously remove games which have been closed. if (!ec)
GameMap::iterator i = m_gameMap.begin();
GameMap::iterator end = m_gameMap.end();
while (i != end)
{ {
GameMap::iterator next = i; // Synchronously remove games which have been closed.
++next; GameMap::iterator i = m_gameMap.begin();
boost::shared_ptr<ServerGame> tmpGame = i->second; GameMap::iterator end = m_gameMap.end();
if (!tmpGame->GetSessionManager().HasSessions()) while (i != end)
InternalRemoveGame(tmpGame); // This will delete the game. {
i = next; GameMap::iterator next = i;
++next;
boost::shared_ptr<ServerGame> tmpGame = i->second;
if (!tmpGame->GetSessionManager().HasSessions())
InternalRemoveGame(tmpGame); // This will delete the game.
i = next;
}
} }
} }
void void
ServerLobbyThread::TimerRemovePlayer() ServerLobbyThread::TimerRemovePlayer(const boost::system::error_code &ec)
{ {
boost::mutex::scoped_lock lock(m_removePlayerListMutex); if (!ec)
if (!m_removePlayerList.empty())
{ {
RemovePlayerList::iterator i = m_removePlayerList.begin(); boost::mutex::scoped_lock lock(m_removePlayerListMutex);
RemovePlayerList::iterator end = m_removePlayerList.end();
if (!m_removePlayerList.empty())
{
RemovePlayerList::iterator i = m_removePlayerList.begin();
RemovePlayerList::iterator end = m_removePlayerList.end();
while (i != end)
{
InternalRemovePlayer(i->first, i->second);
++i;
}
m_removePlayerList.clear();
}
}
}
void
ServerLobbyThread::TimerUpdateClientAvatarLock(const boost::system::error_code &ec)
{
if (!ec)
{
boost::mutex::scoped_lock lock(m_timerAvatarClientAddressMapMutex);
TimerClientAddressMap::iterator i = m_timerAvatarClientAddressMap.begin();
TimerClientAddressMap::iterator end = m_timerAvatarClientAddressMap.end();
while (i != end) while (i != end)
{ {
InternalRemovePlayer(i->first, i->second); TimerClientAddressMap::iterator next = i;
++i; ++next;
if (i->second.elapsed().total_seconds() > SERVER_INIT_AVATAR_CLIENT_LOCK_SEC)
m_timerAvatarClientAddressMap.erase(i);
i = next;
} }
m_removePlayerList.clear();
} }
} }
void void
ServerLobbyThread::TimerUpdateClientAvatarLock() ServerLobbyThread::TimerCheckSessionTimeouts(const boost::system::error_code &ec)
{ {
boost::mutex::scoped_lock lock(m_timerAvatarClientAddressMapMutex); if (!ec)
TimerClientAddressMap::iterator i = m_timerAvatarClientAddressMap.begin();
TimerClientAddressMap::iterator end = m_timerAvatarClientAddressMap.end();
while (i != end)
{ {
TimerClientAddressMap::iterator next = i; m_sessionManager.ForEach(boost::bind(&ServerLobbyThread::InternalCheckSessionTimeouts, boost::ref(*this), _1));
++next; m_gameSessionManager.ForEach(boost::bind(&ServerLobbyThread::InternalCheckSessionTimeouts, boost::ref(*this), _1));
if (i->second.elapsed().total_seconds() > SERVER_INIT_AVATAR_CLIENT_LOCK_SEC)
m_timerAvatarClientAddressMap.erase(i);
i = next;
} }
} }
void void
ServerLobbyThread::TimerCheckSessionTimeouts() ServerLobbyThread::TimerCleanupAvatarCache(const boost::system::error_code &ec)
{ {
m_sessionManager.ForEach(boost::bind(&ServerLobbyThread::InternalCheckSessionTimeouts, boost::ref(*this), _1)); if (!ec)
m_gameSessionManager.ForEach(boost::bind(&ServerLobbyThread::InternalCheckSessionTimeouts, boost::ref(*this), _1));
}
void
ServerLobbyThread::TimerCleanupAvatarCache()
{
// Only act if there are no sessions.
if (!m_sessionManager.HasSessions() && !m_gameSessionManager.HasSessions())
{ {
LOG_VERBOSE("Cleaning up avatar cache."); // Only act if there are no sessions.
if (!m_sessionManager.HasSessions() && !m_gameSessionManager.HasSessions())
{
LOG_VERBOSE("Cleaning up avatar cache.");
m_avatarManager.RemoveOldAvatarCacheEntries(); m_avatarManager.RemoveOldAvatarCacheEntries();
}
} }
} }
@@ -1380,22 +1417,25 @@ ServerLobbyThread::ReadStatisticsFile()
} }
void void
ServerLobbyThread::TimerSaveStatisticsFile() ServerLobbyThread::TimerSaveStatisticsFile(const boost::system::error_code &ec)
{ {
LOG_VERBOSE("Saving statistics."); if (!ec)
boost::mutex::scoped_lock lock(m_statMutex);
if (m_statDataChanged)
{ {
ofstream o(m_statisticsFileName.c_str(), ios_base::out | ios_base::trunc); LOG_VERBOSE("Saving statistics.");
if (!o.fail()) boost::mutex::scoped_lock lock(m_statMutex);
if (m_statDataChanged)
{ {
o << SERVER_STATISTICS_STR_TOTAL_PLAYERS " " << m_statData.totalPlayersEverLoggedIn << endl; ofstream o(m_statisticsFileName.c_str(), ios_base::out | ios_base::trunc);
o << SERVER_STATISTICS_STR_TOTAL_GAMES " " << m_statData.totalGamesEverCreated << endl; if (!o.fail())
o << SERVER_STATISTICS_STR_MAX_PLAYERS " " << m_statData.maxPlayersLoggedIn << endl; {
o << SERVER_STATISTICS_STR_MAX_GAMES " " << m_statData.maxGamesOpen << endl; o << SERVER_STATISTICS_STR_TOTAL_PLAYERS " " << m_statData.totalPlayersEverLoggedIn << endl;
o << SERVER_STATISTICS_STR_CUR_PLAYERS " " << m_statData.numberOfPlayersOnServer << endl; o << SERVER_STATISTICS_STR_TOTAL_GAMES " " << m_statData.totalGamesEverCreated << endl;
o << SERVER_STATISTICS_STR_CUR_GAMES " " << m_statData.numberOfGamesOpen << endl; o << SERVER_STATISTICS_STR_MAX_PLAYERS " " << m_statData.maxPlayersLoggedIn << endl;
m_statDataChanged = false; 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;
}
} }
} }
} }
src/net/servergame.h
+8 -8
View File
@@ -21,6 +21,7 @@
#ifndef _SERVERGAME_H_ #ifndef _SERVERGAME_H_
#define _SERVERGAME_H_ #define _SERVERGAME_H_
#include <boost/enable_shared_from_this.hpp>
#include <third_party/boost/timers.hpp> #include <third_party/boost/timers.hpp>
#include <deque> #include <deque>
@@ -36,11 +37,11 @@ class ConfigFile;
struct GameData; struct GameData;
class Game; class Game;
class ServerGame class ServerGame : public boost::enable_shared_from_this<ServerGame>
{ {
public: public:
ServerGame( ServerGame(
ServerLobbyThread &lobbyThread, u_int32_t id, const std::string &name, const std::string &pwd, const GameData &gameData, unsigned adminPlayerId, GuiInterface &gui, ConfigFile *playerConfig); boost::shared_ptr<ServerLobbyThread> lobbyThread, u_int32_t id, const std::string &name, const std::string &pwd, const GameData &gameData, unsigned adminPlayerId, GuiInterface &gui, ConfigFile *playerConfig);
virtual ~ServerGame(); virtual ~ServerGame();
void Init(); void Init();
@@ -81,7 +82,7 @@ protected:
typedef std::deque<SessionWrapper> SessionQueue; typedef std::deque<SessionWrapper> SessionQueue;
void TimerVoteKick(); void TimerVoteKick(const boost::system::error_code &ec);
void InternalStartGame(); void InternalStartGame();
void ResetGame(); void ResetGame();
@@ -115,8 +116,7 @@ protected:
ServerGameState &GetState(); ServerGameState &GetState();
void SetState(ServerGameState &newState); void SetState(ServerGameState &newState);
unsigned GetStateTimerId() const; boost::asio::deadline_timer &GetStateTimer();
void SetStateTimerId(unsigned newTimerId);
ReceiverHelper &GetReceiver(); ReceiverHelper &GetReceiver();
@@ -141,7 +141,7 @@ private:
boost::shared_ptr<VoteKickData> m_voteKickData; boost::shared_ptr<VoteKickData> m_voteKickData;
ServerLobbyThread &m_lobbyThread; boost::shared_ptr<ServerLobbyThread> m_lobbyThread;
boost::shared_ptr<ReceiverHelper> m_receiver; boost::shared_ptr<ReceiverHelper> m_receiver;
GuiInterface &m_gui; GuiInterface &m_gui;
@@ -156,8 +156,8 @@ private:
ConfigFile *m_playerConfig; ConfigFile *m_playerConfig;
unsigned m_gameNum; unsigned m_gameNum;
unsigned m_curPetitionId; unsigned m_curPetitionId;
unsigned m_voteKickTimerId; boost::asio::deadline_timer m_voteKickTimer;
unsigned m_stateTimerId; boost::asio::deadline_timer m_stateTimer;
friend class ServerLobbyThread; friend class ServerLobbyThread;
friend class AbstractServerGameStateReceiving; friend class AbstractServerGameStateReceiving;
src/net/servergamestate.h
+40 -40
View File
@@ -41,16 +41,16 @@ class ServerGameState
{ {
public: public:
virtual ~ServerGameState(); virtual ~ServerGameState();
virtual void Enter(ServerGame &server) = 0; virtual void Enter(boost::shared_ptr<ServerGame> server) = 0;
virtual void Exit(ServerGame &server) = 0; virtual void Exit(boost::shared_ptr<ServerGame> server) = 0;
virtual void NotifyGameAdminChanged(ServerGame &server) = 0; virtual void NotifyGameAdminChanged(boost::shared_ptr<ServerGame> server) = 0;
// Handling of a new session. // Handling of a new session.
virtual void HandleNewSession(ServerGame &server, SessionWrapper session) = 0; virtual void HandleNewSession(boost::shared_ptr<ServerGame> server, SessionWrapper session) = 0;
// Main processing function of the current state. // Main processing function of the current state.
virtual int ProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet) = 0; virtual int ProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet) = 0;
}; };
// Abstract State: Receiving. // Abstract State: Receiving.
@@ -61,11 +61,11 @@ public:
// Globally handle packets which are allowed in all running states. // Globally handle packets which are allowed in all running states.
// Calls InternalProcess if packet has not been processed. // Calls InternalProcess if packet has not been processed.
virtual int ProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet); virtual int ProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet);
protected: protected:
virtual int InternalProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet) = 0; virtual int InternalProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet) = 0;
}; };
// State: Initialization. // State: Initialization.
@@ -73,24 +73,24 @@ class ServerGameStateInit : public AbstractServerGameStateReceiving
{ {
public: public:
static ServerGameStateInit &Instance(); static ServerGameStateInit &Instance();
virtual void Enter(ServerGame &server); virtual void Enter(boost::shared_ptr<ServerGame> server);
virtual void Exit(ServerGame &server); virtual void Exit(boost::shared_ptr<ServerGame> server);
virtual ~ServerGameStateInit(); virtual ~ServerGameStateInit();
virtual void NotifyGameAdminChanged(ServerGame &server); virtual void NotifyGameAdminChanged(boost::shared_ptr<ServerGame> server);
virtual void HandleNewSession(ServerGame &server, SessionWrapper session); virtual void HandleNewSession(boost::shared_ptr<ServerGame> server, SessionWrapper session);
protected: protected:
ServerGameStateInit(); ServerGameStateInit();
void RegisterAdminTimer(ServerGame &server); void RegisterAdminTimer(boost::shared_ptr<ServerGame> server);
void UnregisterAdminTimer(ServerGame &server); void UnregisterAdminTimer(boost::shared_ptr<ServerGame> server);
void TimerAdminWarning(ServerGame &server); void TimerAdminWarning(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerAdminTimeout(ServerGame &server); void TimerAdminTimeout(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
virtual int InternalProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet); virtual int InternalProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet);
static boost::shared_ptr<NetPacket> CreateNetPacketPlayerJoined(const PlayerData &playerData); static boost::shared_ptr<NetPacket> CreateNetPacketPlayerJoined(const PlayerData &playerData);
@@ -103,20 +103,20 @@ class ServerGameStateStartGame : public AbstractServerGameStateReceiving
{ {
public: public:
static ServerGameStateStartGame &Instance(); static ServerGameStateStartGame &Instance();
virtual void Enter(ServerGame &server); virtual void Enter(boost::shared_ptr<ServerGame> server);
virtual void Exit(ServerGame &server); virtual void Exit(boost::shared_ptr<ServerGame> server);
virtual ~ServerGameStateStartGame(); virtual ~ServerGameStateStartGame();
virtual void NotifyGameAdminChanged(ServerGame &/*server*/) {} virtual void NotifyGameAdminChanged(boost::shared_ptr<ServerGame> /*server*/) {}
virtual void HandleNewSession(ServerGame &server, SessionWrapper session); virtual void HandleNewSession(boost::shared_ptr<ServerGame> server, SessionWrapper session);
protected: protected:
ServerGameStateStartGame(); ServerGameStateStartGame();
virtual int InternalProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet); virtual int InternalProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet);
void TimerTimeout(ServerGame &server); void TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void DoStart(ServerGame &server); void DoStart(boost::shared_ptr<ServerGame> server);
private: private:
static ServerGameStateStartGame s_state; static ServerGameStateStartGame s_state;
@@ -127,25 +127,25 @@ class ServerGameStateHand : public AbstractServerGameStateReceiving
{ {
public: public:
static ServerGameStateHand &Instance(); static ServerGameStateHand &Instance();
virtual void Enter(ServerGame &server); virtual void Enter(boost::shared_ptr<ServerGame> server);
virtual void Exit(ServerGame &server); virtual void Exit(boost::shared_ptr<ServerGame> server);
virtual ~ServerGameStateHand(); virtual ~ServerGameStateHand();
virtual void NotifyGameAdminChanged(ServerGame &/*server*/) {} virtual void NotifyGameAdminChanged(boost::shared_ptr<ServerGame> /*server*/) {}
virtual void HandleNewSession(ServerGame &server, SessionWrapper session); virtual void HandleNewSession(boost::shared_ptr<ServerGame> server, SessionWrapper session);
protected: protected:
ServerGameStateHand(); ServerGameStateHand();
virtual int InternalProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet); virtual int InternalProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet);
void TimerLoop(ServerGame &server); void TimerLoop(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerShowCards(ServerGame &server); void TimerShowCards(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerComputerAction(ServerGame &server); void TimerComputerAction(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerNextHand(ServerGame &server); void TimerNextHand(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
void TimerNextGame(ServerGame &server); void TimerNextGame(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
int GetDealCardsDelaySec(ServerGame &server); int GetDealCardsDelaySec(ServerGame &server);
static void StartNewHand(ServerGame &server); static void StartNewHand(boost::shared_ptr<ServerGame> server);
private: private:
static ServerGameStateHand s_state; static ServerGameStateHand s_state;
@@ -158,19 +158,19 @@ class ServerGameStateWaitPlayerAction : public AbstractServerGameStateReceiving
{ {
public: public:
static ServerGameStateWaitPlayerAction &Instance(); static ServerGameStateWaitPlayerAction &Instance();
virtual void Enter(ServerGame &server); virtual void Enter(boost::shared_ptr<ServerGame> server);
virtual void Exit(ServerGame &server); virtual void Exit(boost::shared_ptr<ServerGame> server);
virtual ~ServerGameStateWaitPlayerAction(); virtual ~ServerGameStateWaitPlayerAction();
virtual void NotifyGameAdminChanged(ServerGame &/*server*/) {} virtual void NotifyGameAdminChanged(boost::shared_ptr<ServerGame> /*server*/) {}
virtual void HandleNewSession(ServerGame &server, SessionWrapper session); virtual void HandleNewSession(boost::shared_ptr<ServerGame> server, SessionWrapper session);
protected: protected:
ServerGameStateWaitPlayerAction(); ServerGameStateWaitPlayerAction();
virtual int InternalProcessPacket(ServerGame &server, SessionWrapper session, boost::shared_ptr<NetPacket> packet); virtual int InternalProcessPacket(boost::shared_ptr<ServerGame> server, SessionWrapper session, boost::shared_ptr<NetPacket> packet);
void TimerTimeout(ServerGame &server); void TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr<ServerGame> server);
private: private:
static ServerGameStateWaitPlayerAction s_state; static ServerGameStateWaitPlayerAction s_state;
src/net/serverlobbythread.h
+17 -10
View File
@@ -24,8 +24,8 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <deque> #include <deque>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <core/timermanager.h>
#include <net/sessionmanager.h> #include <net/sessionmanager.h>
#include <net/netpacket.h> #include <net/netpacket.h>
#include <gui/guiinterface.h> #include <gui/guiinterface.h>
@@ -45,7 +45,7 @@ class AvatarManager;
struct GameData; struct GameData;
class Game; class Game;
class ServerLobbyThread : public Thread class ServerLobbyThread : public Thread, public boost::enable_shared_from_this<ServerLobbyThread>
{ {
public: public:
ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager, ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager,
@@ -89,13 +89,13 @@ public:
u_int32_t GetNextGameId(); u_int32_t GetNextGameId();
ServerCallback &GetCallback(); ServerCallback &GetCallback();
TimerManager &GetTimerManager();
AvatarManager &GetAvatarManager(); AvatarManager &GetAvatarManager();
ServerStats GetStats() const; ServerStats GetStats() const;
boost::posix_time::ptime GetStartTime() const; boost::posix_time::ptime GetStartTime() const;
SenderHelper &GetSender(); SenderHelper &GetSender();
boost::asio::io_service &GetIOService();
protected: protected:
@@ -113,6 +113,7 @@ protected:
// Main function of the thread. // Main function of the thread.
virtual void Main(); virtual void Main();
void RegisterTimers(); void RegisterTimers();
void CancelTimers();
void HandleRead(SessionId sessionId, const boost::system::error_code &error, size_t bytesRead); void HandleRead(SessionId sessionId, const boost::system::error_code &error, size_t bytesRead);
void HandlePacket(SessionWrapper session, boost::shared_ptr<NetPacket> packet); void HandlePacket(SessionWrapper session, boost::shared_ptr<NetPacket> packet);
@@ -127,11 +128,11 @@ protected:
void HandleNetPacketJoinGame(SessionWrapper session, const NetPacketJoinGame &tmpPacket); void HandleNetPacketJoinGame(SessionWrapper session, const NetPacketJoinGame &tmpPacket);
void EstablishSession(SessionWrapper session); void EstablishSession(SessionWrapper session);
void RequestPlayerAvatar(SessionWrapper session); void RequestPlayerAvatar(SessionWrapper session);
void TimerRemoveGame(); void TimerRemoveGame(const boost::system::error_code &ec);
void TimerRemovePlayer(); void TimerRemovePlayer(const boost::system::error_code &ec);
void TimerUpdateClientAvatarLock(); void TimerUpdateClientAvatarLock(const boost::system::error_code &ec);
void TimerCheckSessionTimeouts(); void TimerCheckSessionTimeouts(const boost::system::error_code &ec);
void TimerCleanupAvatarCache(); void TimerCleanupAvatarCache(const boost::system::error_code &ec);
boost::shared_ptr<ServerGame> InternalGetGameFromId(unsigned gameId); boost::shared_ptr<ServerGame> InternalGetGameFromId(unsigned gameId);
void InternalAddGame(boost::shared_ptr<ServerGame> game); void InternalAddGame(boost::shared_ptr<ServerGame> game);
@@ -153,7 +154,7 @@ protected:
void BroadcastStatisticsUpdate(const ServerStats &stats); void BroadcastStatisticsUpdate(const ServerStats &stats);
void ReadStatisticsFile(); void ReadStatisticsFile();
void TimerSaveStatisticsFile(); void TimerSaveStatisticsFile(const boost::system::error_code &ec);
ReceiverHelper &GetReceiver(); ReceiverHelper &GetReceiver();
@@ -180,7 +181,6 @@ private:
SessionManager m_sessionManager; SessionManager m_sessionManager;
SessionManager m_gameSessionManager; SessionManager m_gameSessionManager;
TimerManager m_timerManager;
TimerClientAddressMap m_timerAvatarClientAddressMap; TimerClientAddressMap m_timerAvatarClientAddressMap;
mutable boost::mutex m_timerAvatarClientAddressMapMutex; mutable boost::mutex m_timerAvatarClientAddressMapMutex;
@@ -217,6 +217,13 @@ private:
bool m_statDataChanged; bool m_statDataChanged;
mutable boost::mutex m_statMutex; mutable boost::mutex m_statMutex;
boost::asio::deadline_timer m_removeGameTimer;
boost::asio::deadline_timer m_removePlayerTimer;
boost::asio::deadline_timer m_sessionTimeoutTimer;
boost::asio::deadline_timer m_avatarCleanupTimer;
boost::asio::deadline_timer m_saveStatisticsTimer;
boost::asio::deadline_timer m_avatarLockTimer;
const boost::posix_time::ptime m_startTime; const boost::posix_time::ptime m_startTime;
}; };