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

unix/SignalHandlers: add RAII class

Browse Source
This commit is contained in:
Max Kellermann 2019-02-05 21:33:56 +01:00
parent 40bde1eac9
commit 096c23f27d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Main.cxx
View File

@ -564,7 +564,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#ifndef ANDROID #ifndef ANDROID
setup_log_output(); setup_log_output();
SignalHandlersInit(instance->event_loop); const ScopeSignalHandlersInit signal_handlers_init(instance->event_loop);
#endif #endif
instance->io_thread.Start(); instance->io_thread.Start();
@ -676,9 +676,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#endif #endif
instance->rtio_thread.Stop(); instance->rtio_thread.Stop();
instance->io_thread.Stop(); instance->io_thread.Stop();
#ifndef ANDROID
SignalHandlersFinish();
#endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

11
src/unix/SignalHandlers.hxx
View File

@ -28,4 +28,15 @@ SignalHandlersInit(EventLoop &loop);
void void
SignalHandlersFinish() noexcept; SignalHandlersFinish() noexcept;
class ScopeSignalHandlersInit {
public:
ScopeSignalHandlersInit(EventLoop &loop) {
SignalHandlersInit(loop);
}
~ScopeSignalHandlersInit() noexcept {
SignalHandlersFinish();
}
};
#endif #endif