[GNUnet-SVN] r24402 - in gnunet: contrib src/testbed

[gnunet]

Author: harsha
Date: 2012-10-18 17:33:43 +0200 (Thu, 18 Oct 2012)
New Revision: 24402

Modified:
   gnunet/contrib/testbed_infiniband.conf
   gnunet/src/testbed/gnunet-testbed-profiler.c
Log:
- relaxed to accommodate overlay linking timeouts
- increased bound on parallel overlay connects



Modified: gnunet/contrib/testbed_infiniband.conf
===================================================================
--- gnunet/contrib/testbed_infiniband.conf      2012-10-18 15:12:25 UTC (rev 
24401)
+++ gnunet/contrib/testbed_infiniband.conf      2012-10-18 15:33:43 UTC (rev 
24402)
@@ -4,7 +4,7 @@
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 5
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 50
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [fs]

Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c        2012-10-18 15:12:25 UTC 
(rev 24401)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c        2012-10-18 15:33:43 UTC 
(rev 24402)
@@ -452,8 +452,10 @@
       {
         LOG (GNUNET_ERROR_TYPE_WARNING,
              _("An operation has failed while linking\n"));
-        GNUNET_SCHEDULER_cancel (abort_task);
-        abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+        /* GNUNET_SCHEDULER_cancel (abort_task); */
+        /* abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); */
+       printf ("F");
+       fflush (stdout);
       }
       break;
     case GNUNET_TESTBED_ET_CONNECT:
@@ -461,12 +463,9 @@
         static unsigned int established_links;
 
        if (0 == established_links)
-         printf ("Establishing links\n .");
-       else
-       {
-         printf (".");
-         fflush (stdout);
-       }
+         printf ("Establishing links. Please wait\n");
+       printf (".");
+       fflush (stdout);
         if (++established_links == num_links)
         {
           prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);