aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mutex and ghost games fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-03-29 23:54:08 +02:00
parent 8e0f7dcf03
commit 6d5b29395c
4 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/server.cpp
View file

@ -26,7 +26,7 @@
#include <QDebug> #include <QDebug>
Server::Server(QObject *parent) Server::Server(QObject *parent)
: QObject(parent), nextGameId(0) : QObject(parent), serverMutex(QMutex::Recursive), nextGameId(0)
{ {
} }
@ -46,12 +46,8 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
return authState; return authState;
if (authState == PasswordRight) { if (authState == PasswordRight) {
Server_ProtocolHandler *oldSession = users.value(name); if (users.contains(name))
if (oldSession) { return WouldOverwriteOldSession;
if (!(oldSession->getUserInfo()->getUserLevel() & ServerInfo_User::IsRegistered))
return WouldOverwriteOldSession;
delete oldSession; // ~Server_ProtocolHandler() will call Server::removeClient
}
} else if (authState == UnknownUser) { } else if (authState == UnknownUser) {
// Change user name so that no two users have the same names, // Change user name so that no two users have the same names,
// don't interfere with registered user names though. // don't interfere with registered user names though.
@ -100,11 +96,6 @@ void Server::removeClient(Server_ProtocolHandler *client)
qDebug() << "Server::removeClient: " << clients.size() << "clients; " << users.size() << "users left"; qDebug() << "Server::removeClient: " << clients.size() << "clients; " << users.size() << "users left";
} }
Server_Game *Server::getGame(int gameId) const
{
return games.value(gameId);
}
void Server::broadcastRoomUpdate() void Server::broadcastRoomUpdate()
{ {
QMutexLocker locker(&serverMutex); QMutexLocker locker(&serverMutex);

1
common/server.h
View file

@ -28,7 +28,6 @@ public:
~Server(); ~Server();
AuthenticationResult loginUser(Server_ProtocolHandler *session, QString &name, const QString &password); AuthenticationResult loginUser(Server_ProtocolHandler *session, QString &name, const QString &password);
QList<Server_Game *> getGames() const { return games.values(); } QList<Server_Game *> getGames() const { return games.values(); }
Server_Game *getGame(int gameId) const;
const QMap<int, Server_Room *> &getRooms() { return rooms; } const QMap<int, Server_Room *> &getRooms() { return rooms; }
int getNextGameId() { return nextGameId++; } int getNextGameId() { return nextGameId++; }

5
common/server_game.cpp
View file

@ -64,8 +64,11 @@ void Server_Game::pingClockTimeout()
QList<ServerInfo_PlayerPing *> pingList; QList<ServerInfo_PlayerPing *> pingList;
QMapIterator<int, Server_Player *> playerIterator(players); QMapIterator<int, Server_Player *> playerIterator(players);
bool allPlayersInactive = true; bool allPlayersInactive = true;
int playerCount = 0;
while (playerIterator.hasNext()) { while (playerIterator.hasNext()) {
Server_Player *player = playerIterator.next().value(); Server_Player *player = playerIterator.next().value();
if (!player->getSpectator())
++playerCount;
int pingTime; int pingTime;
if (player->getProtocolHandler()) { if (player->getProtocolHandler()) {
pingTime = player->getProtocolHandler()->getLastCommandTime(); pingTime = player->getProtocolHandler()->getLastCommandTime();
@ -78,7 +81,7 @@ void Server_Game::pingClockTimeout()
const int maxTime = static_cast<Server_Room *>(parent())->getServer()->getMaxGameInactivityTime(); const int maxTime = static_cast<Server_Room *>(parent())->getServer()->getMaxGameInactivityTime();
if (allPlayersInactive) { if (allPlayersInactive) {
if ((++inactivityCounter >= maxTime) && (maxTime > 0)) if (((++inactivityCounter >= maxTime) && (maxTime > 0)) || (playerCount < maxPlayers))
deleteLater(); deleteLater();
} else } else
inactivityCounter = 0; inactivityCounter = 0;

2
common/server_protocolhandler.cpp
View file

@ -263,8 +263,10 @@ ResponseCode Server_ProtocolHandler::cmdLogin(Command_Login *cmd, CommandContain
ignoreList = server->getIgnoreList(userInfo->getName()); ignoreList = server->getIgnoreList(userInfo->getName());
// This might not scale very well. Use an extra QMap if it becomes a problem. // This might not scale very well. Use an extra QMap if it becomes a problem.
QMutexLocker serverLocker(&server->serverMutex);
const QList<Server_Game *> &serverGames = server->getGames(); const QList<Server_Game *> &serverGames = server->getGames();
for (int i = 0; i < serverGames.size(); ++i) { for (int i = 0; i < serverGames.size(); ++i) {
QMutexLocker gameLocker(&serverGames[i]->gameMutex);
const QList<Server_Player *> &gamePlayers = serverGames[i]->getPlayers().values(); const QList<Server_Player *> &gamePlayers = serverGames[i]->getPlayers().values();
for (int j = 0; j < gamePlayers.size(); ++j) for (int j = 0; j < gamePlayers.size(); ++j)
if (gamePlayers[j]->getUserInfo()->getName() == userInfo->getName()) { if (gamePlayers[j]->getUserInfo()->getName() == userInfo->getName()) {