Fixed one serious bug, working on another. Still very broken.

[oweals/gnunet.git] / src / util / signal.c

diff --git a/src/util/signal.c b/src/util/signal.c
index c8d6e04cd4a2ea446b12f5da9d941a4f9fa26b9e..25c33ab5895c3704e795287dceddf64a991abbfd 100644 (file)
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
 /*
      This file is part of GNUnet.

-     (C) 2001, 2002, 2006 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2001, 2002, 2006 Christian Grothoff (and other contributing authors)

 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the

-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.

 */
 
 /**
 */
 
 /**


@@ -25,11 +25,18 @@
  */
 
 #include "platform.h"
  */
 
 #include "platform.h"

-#include "gnunet_common.h"
-#include "gnunet_signal_lib.h"
+#include "gnunet_util_lib.h"
+
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+

 
 struct GNUNET_SIGNAL_Context
 {
 
 struct GNUNET_SIGNAL_Context
 {

+
+  struct GNUNET_SIGNAL_Context *next;
+
+  struct GNUNET_SIGNAL_Context *prev;
+

   int sig;
 
   GNUNET_SIGNAL_Handler method;
   int sig;
 
   GNUNET_SIGNAL_Handler method;


@@ -39,6 +46,11 @@ struct GNUNET_SIGNAL_Context
 #endif
 };
 
 #endif
 };
 

+static struct GNUNET_SIGNAL_Context *sc_head;
+
+static struct GNUNET_SIGNAL_Context *sc_tail;
+
+

 #ifdef WINDOWS
 GNUNET_SIGNAL_Handler w32_sigchld_handler = NULL;
 #endif
 #ifdef WINDOWS
 GNUNET_SIGNAL_Handler w32_sigchld_handler = NULL;
 #endif


@@ -47,14 +59,16 @@ struct GNUNET_SIGNAL_Context *
 GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
 {
   struct GNUNET_SIGNAL_Context *ret;
 GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
 {
   struct GNUNET_SIGNAL_Context *ret;

+

 #ifndef MINGW
   struct sigaction sig;
 #endif
 
 #ifndef MINGW
   struct sigaction sig;
 #endif
 

-  ret = GNUNET_malloc (sizeof (struct GNUNET_SIGNAL_Context));
+  ret = GNUNET_new (struct GNUNET_SIGNAL_Context);

   ret->sig = signum;
   ret->method = handler;
 #ifndef MINGW
   ret->sig = signum;
   ret->method = handler;
 #ifndef MINGW

+  memset (&sig, 0, sizeof (sig));

   sig.sa_handler = (void *) handler;
   sigemptyset (&sig.sa_mask);
 #ifdef SA_INTERRUPT
   sig.sa_handler = (void *) handler;
   sigemptyset (&sig.sa_mask);
 #ifdef SA_INTERRUPT


@@ -67,8 +81,17 @@ GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
   if (signum == GNUNET_SIGCHLD)
     w32_sigchld_handler = handler;
   else
   if (signum == GNUNET_SIGCHLD)
     w32_sigchld_handler = handler;
   else

-    signal (signum, handler);
+  {
+    __p_sig_fn_t sigret = signal (signum, (__p_sig_fn_t) handler);
+
+    if (sigret == SIG_ERR)
+    {
+      LOG (GNUNET_ERROR_TYPE_WARNING, _("signal (%d, %p) returned %d.\n"),
+           signum, handler, sigret);
+    }
+  }

 #endif
 #endif

+  GNUNET_CONTAINER_DLL_insert_tail (sc_head, sc_tail, ret);

   return ret;
 }
 
   return ret;
 }
 


@@ -81,5 +104,29 @@ GNUNET_SIGNAL_handler_uninstall (struct GNUNET_SIGNAL_Context *ctx)
   sigemptyset (&sig.sa_mask);
   sigaction (ctx->sig, &ctx->oldsig, &sig);
 #endif
   sigemptyset (&sig.sa_mask);
   sigaction (ctx->sig, &ctx->oldsig, &sig);
 #endif

+  GNUNET_CONTAINER_DLL_remove (sc_head, sc_tail, ctx);

   GNUNET_free (ctx);
 }
   GNUNET_free (ctx);
 }

+
+
+/**
+ * Raise the given signal by calling the installed signal handlers.  This will
+ * not use the @em raise() system call but only calls the handlers registered
+ * through GNUNET_SIGNAL_handler_install().
+ *
+ * @param sig the signal to raise
+ */
+void
+GNUNET_SIGNAL_raise (const int sig)
+{
+  struct GNUNET_SIGNAL_Context *ctx;
+
+  for (ctx = sc_head; NULL != ctx; ctx = ctx->next)
+  {
+    if (sig != ctx->sig)
+      continue;
+    if (NULL == ctx->method)
+      continue;
+    ctx->method ();
+  }
+}