X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Ffatal-signal.c;h=ed82173a4ad1cd2727c361b09777e1977e21bb84;hb=c38e3405d927ce999d59e837b82529552df8e168;hp=60a188e6fd1f9bfecae44f627bd7de9c33756349;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=openvswitch

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 60a188e6..ed82173a 100644
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,13 @@
 #include <unistd.h>
 #include "poll-loop.h"
 #include "shash.h"
+#include "sset.h"
 #include "socket-util.h"
 #include "util.h"
-
-#define THIS_MODULE VLM_fatal_signal
 #include "vlog.h"
 
+VLOG_DEFINE_THIS_MODULE(fatal_signal);
+
 /* Signals to catch. */
 static const int fatal_signals[] = { SIGTERM, SIGINT, SIGHUP, SIGALRM };
 
@@ -134,11 +135,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 +167,7 @@ fatal_signal_run(void)
 void
 fatal_signal_wait(void)
 {
+    fatal_signal_init();
     poll_fd_wait(signal_fds[0], POLLIN);
 }
 
@@ -179,8 +195,8 @@ call_hooks(int sig_nr)
     }
 }
 
-/* Files to delete on exit.  (The 'data' member of each node is unused.) */
-static struct shash files = SHASH_INITIALIZER(&files);
+/* Files to delete on exit. */
+static struct sset files = SSET_INITIALIZER(&files);
 
 /* Has a hook function been registered with fatal_signal_add_hook() (and not
  * cleared by fatal_signal_fork())? */
@@ -200,9 +216,7 @@ fatal_signal_add_file_to_unlink(const char *file)
         fatal_signal_add_hook(unlink_files, cancel_files, NULL, true);
     }
 
-    if (!shash_find(&files, file)) {
-        shash_add(&files, file, NULL);
-    }
+    sset_add(&files, file);
 }
 
 /* Unregisters 'file' from being unlinked when the program terminates via
@@ -210,12 +224,7 @@ fatal_signal_add_file_to_unlink(const char *file)
 void
 fatal_signal_remove_file_to_unlink(const char *file)
 {
-    struct shash_node *node;
-
-    node = shash_find(&files, file);
-    if (node) {
-        shash_delete(&files, node);
-    }
+    sset_find_and_delete(&files, file);
 }
 
 /* Like fatal_signal_remove_file_to_unlink(), but also unlinks 'file'.
@@ -234,25 +243,25 @@ fatal_signal_unlink_file_now(const char *file)
 }
 
 static void
-unlink_files(void *aux UNUSED)
+unlink_files(void *aux OVS_UNUSED)
 {
-    do_unlink_files(); 
+    do_unlink_files();
 }
 
 static void
-cancel_files(void *aux UNUSED)
+cancel_files(void *aux OVS_UNUSED)
 {
-    shash_clear(&files);
+    sset_clear(&files);
     added_hook = false;
 }
 
 static void
 do_unlink_files(void)
 {
-    struct shash_node *node;
+    const char *file;
 
-    SHASH_FOR_EACH (node, &files) {
-        unlink(node->name);
+    SSET_FOR_EACH (file, &files) {
+        unlink(file);
     }
 }