gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-08 03:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

changed a lot of thread locking code in the server, rooms are working with ISL now

Browse Source
This commit is contained in:
Max-Wilhelm Bruker
2012-03-17 16:09:00 +01:00
parent 572e4eaafa
commit c23af44749
16 changed files with 449 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/server_game.cpp
View File

@@ -65,7 +65,7 @@ Server_Game::Server_Game(Server_ProtocolHandler *_creator, int _gameId, const QS
Server_Game::~Server_Game()
{
room->roomMutex.lock();
room->gamesMutex.lock();
gameMutex.lock();
sendGameEventContainer(prepareGameEvent(Event_GameClosed(), -1));
@@ -80,7 +80,7 @@ Server_Game::~Server_Game()
creatorInfo = 0;
gameMutex.unlock();
room->roomMutex.unlock();
room->gamesMutex.unlock();
currentReplay->set_duration_seconds(secondsElapsed - startTimeOfThisGame);
replayList.append(currentReplay);
@@ -371,7 +371,6 @@ Server_Player *Server_Game::addPlayer(Server_ProtocolHandler *handler, bool spec
void Server_Game::removePlayer(Server_Player *player)
{
QMutexLocker roomLocker(&room->roomMutex);
QMutexLocker locker(&gameMutex);
players.remove(player->getPlayerId());
@@ -461,7 +460,6 @@ void Server_Game::unattachCards(GameEventStorage &ges, Server_Player *player)
bool Server_Game::kickPlayer(int playerId)
{
QMutexLocker roomLocker(&room->roomMutex);
QMutexLocker locker(&gameMutex);
Server_Player *playerToKick = players.value(playerId);