oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: run the OS X native event loop after forking

Browse Source
This commit is contained in:
NanoTech 2014-10-12 16:29:43 -06:00 committed by Max Kellermann
parent 6ad1e4d99a
commit d42c0f1dc5
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Main.cxx
View File

@ -114,6 +114,10 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#ifdef __APPLE__
#include <dispatch/dispatch.h>
#endif
#include <limits.h> #include <limits.h>
static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096; static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096;
@ -408,6 +412,8 @@ int main(int argc, char *argv[])
#endif #endif
static int mpd_main_after_fork(struct options);
#ifdef ANDROID #ifdef ANDROID
static inline static inline
#endif #endif
@ -511,6 +517,27 @@ int mpd_main(int argc, char *argv[])
daemonize_begin(options.daemon); daemonize_begin(options.daemon);
#endif #endif
#ifdef __APPLE__
/* Runs the OS X native event loop in the main thread, and runs
the rest of mpd_main on a new thread. This lets CoreAudio receive
route change notifications (e.g. plugging or unplugging headphones).
All hardware output on OS X ultimately uses CoreAudio internally.
This must be run after forking; if dispatch is called before forking,
the child process will have a broken internal dispatch state. */
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
exit(mpd_main_after_fork(options));
});
dispatch_main();
return EXIT_FAILURE; // unreachable, because dispatch_main never returns
#else
return mpd_main_after_fork(options);
#endif
}
static int mpd_main_after_fork(struct options options)
{
Error error;
GlobalEvents::Initialize(*instance->event_loop); GlobalEvents::Initialize(*instance->event_loop);
GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted); GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted);
#ifdef WIN32 #ifdef WIN32