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

event/SignalMonitor: use BoundMethod instead of raw function pointer

Browse Source
This commit is contained in:
Max Kellermann
2016-06-20 10:25:28 +02:00
parent c3d9c32615
commit 4280f84535
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/unix/SignalHandlers.cxx
View File

@@ -34,9 +34,10 @@
static constexpr Domain signal_handlers_domain("signal_handlers");
static void
HandleShutdownSignal()
HandleShutdownSignal(void *ctx)
{
SignalMonitorGetEventLoop().Break();
auto &loop = *(EventLoop *)ctx;
loop.Break();
}
static void
@@ -47,7 +48,7 @@ x_sigaction(int signum, const struct sigaction *act)
}
static void
handle_reload_event(void)
handle_reload_event(void *)
{
LogDebug(signal_handlers_domain, "got SIGHUP, reopening log files");
cycle_log_files();
@@ -68,10 +69,10 @@ SignalHandlersInit(EventLoop &loop)
sa.sa_handler = SIG_IGN;
x_sigaction(SIGPIPE, &sa);
SignalMonitorRegister(SIGINT, HandleShutdownSignal);
SignalMonitorRegister(SIGTERM, HandleShutdownSignal);
SignalMonitorRegister(SIGINT, {&loop, HandleShutdownSignal});
SignalMonitorRegister(SIGTERM, {&loop, HandleShutdownSignal});
SignalMonitorRegister(SIGHUP, handle_reload_event);
SignalMonitorRegister(SIGHUP, {nullptr, handle_reload_event});
#endif
}