Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media_server: Check BMessenger validity

Browse Source 
* Check BMessenger::IsValid on the instance
  used to query the nodes so that crashed
  teams are identified as soon as possible.
This commit is contained in:
Dario Casalinuovo 2015-07-24 01:21:54 +02:00
parent 61a59e87d8
commit 4a99aae9e4
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/servers/media/AppManager.cpp
View File

@ -192,8 +192,6 @@ void
AppManager::_BigBrother()
{
status_t status = B_TIMED_OUT;
BMessage ping('PING');
BMessage reply;
do {
if (!Lock())
@ -202,21 +200,29 @@ AppManager::_BigBrother()
bool startOver = false;
AppMap::iterator iterator = fMap.begin();
for (; iterator != fMap.end(); iterator++) {
reply.what = 0;
status = iterator->second.SendMessage(&ping, &reply, 5000000,
2000000);
if (status != B_OK || reply.what != 'PONG') {
team_id team = iterator->first;
Unlock();
_TeamDied(team);
// No need to send the alive message
// if the team died.
if (iterator->second.IsValid() == true) {
BMessage ping('PING');
BMessage reply;
reply.what = 0;
status = iterator->second.SendMessage(&ping, &reply, 5000000,
2000000);
if (status != B_OK || reply.what != 'PONG') {
startOver = true;
break;
}
} else {
startOver = true;
break;
}
}
if (startOver)
if (startOver == true) {
Unlock();
_TeamDied(iterator->first);
continue;
}
Unlock();
status = acquire_sem_etc(fQuit, 1, B_RELATIVE_TIMEOUT, 2000000);