ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed potential deadlock, made debug output more useful.

Browse Source
This commit is contained in:
hiker 2016-12-08 09:46:44 +11:00
parent 32daf4ce29
commit fed12f774c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/protocols/server_lobby.cpp
View File

@ -217,8 +217,8 @@ void ServerLobby::update(float dt)
signalRaceStartToClients(); signalRaceStartToClients();
m_server_delay = 0.02f; m_server_delay = 0.02f;
m_client_ready_count.getData() = 0; m_client_ready_count.getData() = 0;
m_client_ready_count.unlock();
} }
m_client_ready_count.unlock();
// Initialise counter again, to wait for all clients to indicate that // Initialise counter again, to wait for all clients to indicate that
// they have started the race/ // they have started the race/
break; break;
@ -887,11 +887,11 @@ void ServerLobby::finishedLoadingWorldClient(Event *event)
m_client_ready_count.unlock(); m_client_ready_count.unlock();
return; return;
} }
Log::info("ServerLobbyeProtocol", "Player %d is ready (%d/%d).",
player_id, m_client_ready_count.getData(),
m_game_setup->getPlayerCount() );
m_player_states[player_id] = true; m_player_states[player_id] = true;
m_client_ready_count.getData()++; m_client_ready_count.getData()++;
Log::info("ServerLobbyeProtocol", "Player %d is ready (%d/%d).",
player_id, m_client_ready_count.getData(),
m_game_setup->getPlayerCount());
} }
m_client_ready_count.unlock(); m_client_ready_count.unlock();