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

[gnunet]

Author: harsha
Date: 2012-07-14 20:39:06 +0200 (Sat, 14 Jul 2012)
New Revision: 22660

Modified:
   gnunet/src/testbed/gnunet-testbed-helper.c
   gnunet/src/testbed/test_gnunet_testbed_helper.c
Log:
relaxed time for shutdown

Modified: gnunet/src/testbed/gnunet-testbed-helper.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-helper.c  2012-07-14 18:30:25 UTC (rev 
22659)
+++ gnunet/src/testbed/gnunet-testbed-helper.c  2012-07-14 18:39:06 UTC (rev 
22660)
@@ -150,7 +150,7 @@
   if (GNUNET_YES == ignore_reading)
     return;
   ret = GNUNET_SERVER_mst_receive (tokenizer, NULL, buf, sread,
-                                   GNUNET_YES, GNUNET_YES);
+                                   GNUNET_NO, GNUNET_NO);
   GNUNET_assert (GNUNET_SYSERR != ret);
   if (GNUNET_NO == ret)
   {
@@ -172,6 +172,7 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
+  LOG_DEBUG ("Starting testbed helper...\n");
   tokenizer = GNUNET_SERVER_mst_create (&tokenizer_cb, NULL);
   stdin_fd = GNUNET_DISK_get_handle_from_native (stdin);
   buf_size = sizeof (struct GNUNET_TESTBED_HelperInit) + 8 * 1024;

Modified: gnunet/src/testbed/test_gnunet_testbed_helper.c
===================================================================
--- gnunet/src/testbed/test_gnunet_testbed_helper.c     2012-07-14 18:30:25 UTC 
(rev 22659)
+++ gnunet/src/testbed/test_gnunet_testbed_helper.c     2012-07-14 18:39:06 UTC 
(rev 22660)
@@ -109,7 +109,9 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Message sent\n");
   GNUNET_assert (GNUNET_OK == result);
   if (GNUNET_SCHEDULER_NO_TASK == shutdown_task)
-    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    shutdown_task = GNUNET_SCHEDULER_add_delayed 
+      (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2),
+       &do_shutdown, NULL);
 }