From fe563bb573dcf697d9773ca44bdb2b7c27fa6826 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 23 Oct 2012 12:37:30 +0000 Subject: exit during errors too --- src/testbed/gnunet-testbed-profiler.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/testbed/gnunet-testbed-profiler.c') diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 73785a71c..4168408e9 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -358,6 +358,7 @@ peer_churn_cb (void *cls, const char *emsg) topology, GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY, GNUNET_TESTBED_TOPOLOGY_OPTION_END); + num_links = num_peers * (num_peers - 1); break; default: GNUNET_assert (0); @@ -524,7 +525,7 @@ controller_event_cb (void *cls, } break; case STATE_PEERS_LINKING: - switch (event->type) + switch (event->type) { case GNUNET_TESTBED_ET_OPERATION_FINISHED: /* Control reaches here when a peer linking operation fails */ @@ -539,6 +540,7 @@ controller_event_cb (void *cls, print_overlay_links_summary (); GNUNET_SCHEDULER_cancel (abort_task); abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); + return; } } break; @@ -551,19 +553,17 @@ controller_event_cb (void *cls, printf ("."); fflush (stdout); established_links++; - if ((established_links + failed_links) == - (GNUNET_TESTBED_TOPOLOGY_CLIQUE == topology ? - num_peers * (num_peers -1) : num_links)) - { - print_overlay_links_summary (); - result = GNUNET_OK; - shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); - } } break; default: GNUNET_assert (0); } + if ((established_links + failed_links) == num_links) + { + print_overlay_links_summary (); + result = GNUNET_OK; + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + } break; default: GNUNET_assert (0); -- cgit v1.2.3