unix/SignalHandlers: pass Instance to ...Init()
This commit is contained in:
parent
322d6f2a40
commit
29d05cdb8e
@ -464,7 +464,7 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
|
||||
#ifndef ANDROID
|
||||
setup_log_output();
|
||||
|
||||
const ScopeSignalHandlersInit signal_handlers_init(instance.event_loop);
|
||||
const ScopeSignalHandlersInit signal_handlers_init(instance);
|
||||
#endif
|
||||
|
||||
instance.io_thread.Start();
|
||||
|
@ -18,13 +18,13 @@
|
||||
*/
|
||||
|
||||
#include "SignalHandlers.hxx"
|
||||
#include "Instance.hxx"
|
||||
#include "event/SignalMonitor.hxx"
|
||||
|
||||
#ifndef _WIN32
|
||||
|
||||
#include "Log.hxx"
|
||||
#include "LogInit.hxx"
|
||||
#include "event/Loop.hxx"
|
||||
#include "system/Error.hxx"
|
||||
#include "util/Domain.hxx"
|
||||
|
||||
@ -56,8 +56,10 @@ handle_reload_event(void *) noexcept
|
||||
#endif
|
||||
|
||||
void
|
||||
SignalHandlersInit(EventLoop &loop)
|
||||
SignalHandlersInit(Instance &instance)
|
||||
{
|
||||
auto &loop = instance.event_loop;
|
||||
|
||||
SignalMonitorInit(loop);
|
||||
|
||||
#ifndef _WIN32
|
||||
|
@ -20,18 +20,18 @@
|
||||
#ifndef MPD_SIGNAL_HANDLERS_HXX
|
||||
#define MPD_SIGNAL_HANDLERS_HXX
|
||||
|
||||
class EventLoop;
|
||||
struct Instance;
|
||||
|
||||
void
|
||||
SignalHandlersInit(EventLoop &loop);
|
||||
SignalHandlersInit(Instance &instance);
|
||||
|
||||
void
|
||||
SignalHandlersFinish() noexcept;
|
||||
|
||||
class ScopeSignalHandlersInit {
|
||||
public:
|
||||
ScopeSignalHandlersInit(EventLoop &loop) {
|
||||
SignalHandlersInit(loop);
|
||||
ScopeSignalHandlersInit(Instance &instance) {
|
||||
SignalHandlersInit(instance);
|
||||
}
|
||||
|
||||
~ScopeSignalHandlersInit() noexcept {
|
||||
|
Loading…
Reference in New Issue
Block a user