Commit 096c23f2 authored by Max Kellermann's avatar Max Kellermann

unix/SignalHandlers: add RAII class

parent 40bde1ea
...@@ -564,7 +564,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config) ...@@ -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) ...@@ -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;
} }
......
...@@ -28,4 +28,15 @@ SignalHandlersInit(EventLoop &loop); ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment