[GNUnet-SVN] r22936 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-07-27 12:09:05 +0200 (Fri, 27 Jul 2012)
New Revision: 22936

Modified:
   gnunet/src/testbed/gnunet-testbed-helper.c
Log:
helper shutdown on stdin close

Modified: gnunet/src/testbed/gnunet-testbed-helper.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-helper.c  2012-07-26 19:54:22 UTC (rev 
22935)
+++ gnunet/src/testbed/gnunet-testbed-helper.c  2012-07-27 10:09:05 UTC (rev 
22936)
@@ -154,6 +154,7 @@
   tokenizer = NULL;
   if (NULL != testbed)
   {
+    LOG_DEBUG ("Killing testbed\n");
     GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
     GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (testbed));
     GNUNET_OS_process_destroy (testbed);
@@ -337,7 +338,7 @@
   if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
     return;  
   sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf));
-  if (GNUNET_SYSERR == sread)
+  if ((GNUNET_SYSERR == sread) || (0 == sread))
   {
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -388,8 +389,7 @@
 
 
 /**
- * Signal handler called for SIGCHLD.  Triggers the
- * respective handler by writing to the trigger pipe.
+ * Signal handler called for SIGCHLD.
  */
 static void
 sighandler_child_death ()