[GNUnet-SVN] r16287 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2011-08-01 22:35:48 +0200 (Mon, 01 Aug 2011)
New Revision: 16287

Modified:
   gnunet/src/include/gnunet_os_lib.h
   gnunet/src/util/os_priority.c
   gnunet/src/util/scheduler.c
Log:
LRN: Don't wait for parent control handler to quit

CG: Note: this should not stand; temporary hack.


Modified: gnunet/src/include/gnunet_os_lib.h
===================================================================
--- gnunet/src/include/gnunet_os_lib.h  2011-08-01 20:34:26 UTC (rev 16286)
+++ gnunet/src/include/gnunet_os_lib.h  2011-08-01 20:35:48 UTC (rev 16287)
@@ -339,6 +339,13 @@
                                           const struct
                                           GNUNET_SCHEDULER_TaskContext * tc);
 
+/**
+ * Called everty time the parent process sends a signal
+ */
+void
+parent_control_handler (void *cls,
+                       const struct
+                       GNUNET_SCHEDULER_TaskContext * tc);
 
 /**
  * Check whether an executable exists and possibly

Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c       2011-08-01 20:34:26 UTC (rev 16286)
+++ gnunet/src/util/os_priority.c       2011-08-01 20:35:48 UTC (rev 16287)
@@ -51,7 +51,7 @@
  * @param cls the 'struct GNUNET_DISK_FileHandle' of the control pipe
  * @param tc scheduler context
  */
-static void
+void
 parent_control_handler (void *cls,
                        const struct
                        GNUNET_SCHEDULER_TaskContext * tc)

Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2011-08-01 20:34:26 UTC (rev 16286)
+++ gnunet/src/util/scheduler.c 2011-08-01 20:35:48 UTC (rev 16287)
@@ -751,7 +751,11 @@
 #endif
   last_tr = 0;
   busy_wait_warning = 0;
-  while ((pending != NULL) ||
+  while ((pending != NULL
+#if ENABLE_WINDOWS_WORKAROUNDS
+          && (pending->callback != parent_control_handler || pending->next != 
NULL)
+#endif
+         ) ||
         (pending_timeout != NULL) ||
         (ready_count > 0))
     {