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

shutdown_media_server: Rely on actual instance

Browse Source 
* Makes the shutdown process to rely on the instance that was
running at the time the function is called. While it's unlikely
anyone will see any change from that, this way we will not conflict
in any case with the launch_daemon.
* The reply could have been confused in a remote situation, make
every request to use an it's own object.
* In launch_media_server there was a wrong variable redefinition
too.
This commit is contained in:
Dario Casalinuovo 2016-04-22 15:33:13 +02:00
parent e4704eb6f9
commit 20802959d3
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/kits/media/MediaDefs.cpp
View File

@ -1298,7 +1298,6 @@ shutdown_media_server(bigtime_t timeout,
void* cookie) void* cookie)
{ {
BMessage msg(B_QUIT_REQUESTED); BMessage msg(B_QUIT_REQUESTED);
BMessage reply;
status_t err = B_MEDIA_SYSTEM_FAILURE; status_t err = B_MEDIA_SYSTEM_FAILURE;
bool shutdown = false; bool shutdown = false;
@ -1314,15 +1313,19 @@ shutdown_media_server(bigtime_t timeout,
if ((err = msg.AddBool("be:_user_request", true)) != B_OK) if ((err = msg.AddBool("be:_user_request", true)) != B_OK)
return err; return err;
if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)) { team_id mediaServer = be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE);
BMessenger messenger(B_MEDIA_SERVER_SIGNATURE); team_id addOnServer = be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE);
if (mediaServer != B_ERROR) {
BMessage reply;
BMessenger messenger(B_MEDIA_SERVER_SIGNATURE, mediaServer);
progress_shutdown(10, progress, cookie); progress_shutdown(10, progress, cookie);
err = messenger.SendMessage(&msg, &reply, 2000000, 2000000); err = messenger.SendMessage(&msg, &reply, 2000000, 2000000);
reply.FindBool("_shutdown", &shutdown); reply.FindBool("_shutdown", &shutdown);
if (err == B_TIMED_OUT || shutdown == false) { if (err == B_TIMED_OUT || shutdown == false) {
if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)) if (messenger.IsValid())
kill_team(be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE)); kill_team(mediaServer);
} else if (err != B_OK) } else if (err != B_OK)
return err; return err;
@ -1333,24 +1336,29 @@ shutdown_media_server(bigtime_t timeout,
return rv; return rv;
} }
if (be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) { if (addOnServer != B_ERROR) {
shutdown = false; shutdown = false;
BMessenger messenger(B_MEDIA_ADDON_SERVER_SIGNATURE); BMessage reply;
BMessenger messenger(B_MEDIA_ADDON_SERVER_SIGNATURE, addOnServer);
progress_shutdown(40, progress, cookie); progress_shutdown(40, progress, cookie);
err = messenger.SendMessage(&msg, &reply, 2000000, 2000000); // The media_server usually shutdown the media_addon_server,
reply.FindBool("_shutdown", &shutdown); // if not let's do something.
if (err == B_TIMED_OUT || shutdown == false) { if (messenger.IsValid()) {
if (be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) err = messenger.SendMessage(&msg, &reply, 2000000, 2000000);
kill_team(be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE)); reply.FindBool("_shutdown", &shutdown);
} else if (err != B_OK) if (err == B_TIMED_OUT || shutdown == false) {
return err; if (messenger.IsValid())
kill_team(addOnServer);
} else if (err != B_OK)
return err;
progress_shutdown(50, progress, cookie); progress_shutdown(50, progress, cookie);
int32 rv; int32 rv;
if (reply.FindInt32("error", &rv) == B_OK && rv != B_OK) if (reply.FindInt32("error", &rv) == B_OK && rv != B_OK)
return rv; return rv;
}
} }
progress_shutdown(100, progress, cookie); progress_shutdown(100, progress, cookie);
@ -1430,7 +1438,7 @@ launch_media_server(bigtime_t timeout,
// At this point, it might be that the launch_daemon isn't // At this point, it might be that the launch_daemon isn't
// restarting us, then we'll attempt at launching the server // restarting us, then we'll attempt at launching the server
// ourselves. // ourselves.
status_t err = be_roster->Launch(B_MEDIA_SERVER_SIGNATURE); err = be_roster->Launch(B_MEDIA_SERVER_SIGNATURE);
if (err != B_OK) if (err != B_OK)
return err; return err;