netdev-linux: Factor out obtaining an RTNL socket.

[openvswitch] / lib / fatal-signal.c

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 60a188e6fd1f9bfecae44f627bd7de9c33756349..2e38fc51aca1fc8b0e2c5d71f3fc8deff36a6abc 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -134,11 +134,25 @@ fatal_signal_handler(int sig_nr)
     stored_sig_nr = sig_nr;
 }
 
+/* Check whether a fatal signal has occurred and, if so, call the fatal signal
+ * hooks and exit.
+ *
+ * This function is called automatically by poll_block(), but specialized
+ * programs that may not always call poll_block() on a regular basis should
+ * also call it periodically.  (Therefore, any function with "block" in its
+ * name should call fatal_signal_run() each time it is called, either directly
+ * or through poll_block(), because such functions can only used by specialized
+ * programs that can afford to block outside their main loop around
+ * poll_block().)
+ */
 void
 fatal_signal_run(void)
 {
-    int sig_nr = stored_sig_nr;
+    int sig_nr;
 
+    fatal_signal_init();
+
+    sig_nr = stored_sig_nr;
     if (sig_nr != SIG_ATOMIC_MAX) {
         call_hooks(sig_nr);
 
@@ -152,6 +166,7 @@ fatal_signal_run(void)
 void
 fatal_signal_wait(void)
 {
+    fatal_signal_init();
     poll_fd_wait(signal_fds[0], POLLIN);
 }
 
@@ -234,13 +249,13 @@ fatal_signal_unlink_file_now(const char *file)
 }
 
 static void
-unlink_files(void *aux UNUSED)
+unlink_files(void *aux OVS_UNUSED)
 {
     do_unlink_files(); 
 }
 
 static void
-cancel_files(void *aux UNUSED)
+cancel_files(void *aux OVS_UNUSED)
 {
     shash_clear(&files);
     added_hook = false;