From 55e893b9ebda8d834bfa6afd76b1afc28d5e7345 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Thu, 18 Oct 2012 15:33:43 +0000 Subject: - relaxed to accommodate overlay linking timeouts - increased bound on parallel overlay connects --- contrib/testbed_infiniband.conf | 2 +- src/testbed/gnunet-testbed-profiler.c | 15 +++++++-------- 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 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] 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, { 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 @@ controller_event_cb (void *cls, 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); -- cgit v1.2.3