aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/testbed_infiniband.conf2
-rw-r--r--src/testbed/gnunet-testbed-profiler.c15
2 files changed, 8 insertions, 9 deletions
diff --git a/contrib/testbed_infiniband.conf b/contrib/testbed_infiniband.conf
index 1c59eff6d..818aba097 100644
--- a/contrib/testbed_infiniband.conf
+++ b/contrib/testbed_infiniband.conf
@@ -4,7 +4,7 @@ PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; 4ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
5HOSTNAME = localhost 5HOSTNAME = localhost
6MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 6MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
7MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 5 7MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 50
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args 8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9 9
10[fs] 10[fs]
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index f2aa0bcc8..04da08076 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -452,8 +452,10 @@ controller_event_cb (void *cls,
452 { 452 {
453 LOG (GNUNET_ERROR_TYPE_WARNING, 453 LOG (GNUNET_ERROR_TYPE_WARNING,
454 _("An operation has failed while linking\n")); 454 _("An operation has failed while linking\n"));
455 GNUNET_SCHEDULER_cancel (abort_task); 455 /* GNUNET_SCHEDULER_cancel (abort_task); */
456 abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); 456 /* abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); */
457 printf ("F");
458 fflush (stdout);
457 } 459 }
458 break; 460 break;
459 case GNUNET_TESTBED_ET_CONNECT: 461 case GNUNET_TESTBED_ET_CONNECT:
@@ -461,12 +463,9 @@ controller_event_cb (void *cls,
461 static unsigned int established_links; 463 static unsigned int established_links;
462 464
463 if (0 == established_links) 465 if (0 == established_links)
464 printf ("Establishing links\n ."); 466 printf ("Establishing links. Please wait\n");
465 else 467 printf (".");
466 { 468 fflush (stdout);
467 printf (".");
468 fflush (stdout);
469 }
470 if (++established_links == num_links) 469 if (++established_links == num_links)
471 { 470 {
472 prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); 471 prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);