#include "signals.h"
#include "socket-util.h"
#include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
#include "type-props.h"
static size_t n_hooks;
static int signal_fds[2];
-HANDLE wevent;
static volatile sig_atomic_t stored_sig_nr = SIG_ATOMIC_MAX;
+#ifdef _WIN32
+static HANDLE wevent;
+#endif
+
static struct ovs_mutex mutex;
-static void atexit_handler(void);
static void call_hooks(int sig_nr);
#ifdef _WIN32
static BOOL WINAPI ConsoleHandlerRoutine(DWORD dwCtrlType);
}
#endif
}
- atexit(atexit_handler);
+ atexit(fatal_signal_atexit_handler);
}
}
VLOG_WARN("terminating with signal %d", (int)sig_nr);
#endif
call_hooks(sig_nr);
+ fflush(stderr);
/* Re-raise the signal with the default handling so that the program
* termination status reflects that we were killed by this signal */
fatal_signal_wait(void)
{
fatal_signal_init();
- poll_fd_wait_event(signal_fds[0], wevent, POLLIN);
+#ifdef _WIN32
+ poll_wevent_wait(wevent);
+#else
+ poll_fd_wait(signal_fds[0], POLLIN);
+#endif
}
-static void
-atexit_handler(void)
+void
+fatal_ignore_sigpipe(void)
+{
+#ifndef _WIN32
+ signal(SIGPIPE, SIG_IGN);
+#endif
+}
+
+void
+fatal_signal_atexit_handler(void)
{
call_hooks(0);
}
raise(stored_sig_nr);
}
}
+
+#ifndef _WIN32
+/* Blocks all fatal signals and returns previous signal mask into
+ * 'prev_mask'. */
+void
+fatal_signal_block(sigset_t *prev_mask)
+{
+ int i;
+ sigset_t block_mask;
+
+ sigemptyset(&block_mask);
+ for (i = 0; i < ARRAY_SIZE(fatal_signals); i++) {
+ int sig_nr = fatal_signals[i];
+ sigaddset(&block_mask, sig_nr);
+ }
+ xpthread_sigmask(SIG_BLOCK, &block_mask, prev_mask);
+}
+#endif