From c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 5 Oct 2019 15:09:28 +0200 Subject: global reindent, now with uncrustify hook enabled --- src/testbed/test_testbed_api_topology.c | 122 ++++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'src/testbed/test_testbed_api_topology.c') diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index c6e25c656..1fa13bf4f 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c @@ -46,7 +46,7 @@ static struct GNUNET_TESTBED_Operation *op; /** * Shutdown task */ -static struct GNUNET_SCHEDULER_Task * shutdown_task; +static struct GNUNET_SCHEDULER_Task *shutdown_task; /** * Testing result @@ -65,15 +65,15 @@ static unsigned int overlay_connects; * @param cls NULL */ static void -do_shutdown(void *cls) +do_shutdown (void *cls) { shutdown_task = NULL; if (NULL != op) - { - GNUNET_TESTBED_operation_done(op); - op = NULL; - } - GNUNET_SCHEDULER_shutdown(); + { + GNUNET_TESTBED_operation_done (op); + op = NULL; + } + GNUNET_SCHEDULER_shutdown (); } /** @@ -83,36 +83,36 @@ do_shutdown(void *cls) * @param event the controller event */ static void -controller_event_cb(void *cls, - const struct GNUNET_TESTBED_EventInformation *event) +controller_event_cb (void *cls, + const struct GNUNET_TESTBED_EventInformation *event) { switch (event->type) + { + case GNUNET_TESTBED_ET_CONNECT: + overlay_connects++; + if ((NUM_PEERS) == overlay_connects) { - case GNUNET_TESTBED_ET_CONNECT: - overlay_connects++; - if ((NUM_PEERS) == overlay_connects) - { - result = GNUNET_OK; - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL); - } - break; - - case GNUNET_TESTBED_ET_OPERATION_FINISHED: - GNUNET_assert(NULL != event->details.operation_finished.emsg); - break; - - default: - GNUNET_break(0); - if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && - (NULL != event->details.operation_finished.emsg)) - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - "An operation failed with error: %s\n", - event->details.operation_finished.emsg); - result = GNUNET_SYSERR; - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL); + result = GNUNET_OK; + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); } + break; + + case GNUNET_TESTBED_ET_OPERATION_FINISHED: + GNUNET_assert (NULL != event->details.operation_finished.emsg); + break; + + default: + GNUNET_break (0); + if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && + (NULL != event->details.operation_finished.emsg)) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "An operation failed with error: %s\n", + event->details.operation_finished.emsg); + result = GNUNET_SYSERR; + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + } } @@ -129,37 +129,37 @@ controller_event_cb(void *cls, * failed */ static void -test_master(void *cls, - struct GNUNET_TESTBED_RunHandle *h, - unsigned int num_peers, - struct GNUNET_TESTBED_Peer **peers_, - unsigned int links_succeeded, - unsigned int links_failed) +test_master (void *cls, + struct GNUNET_TESTBED_RunHandle *h, + unsigned int num_peers, + struct GNUNET_TESTBED_Peer **peers_, + unsigned int links_succeeded, + unsigned int links_failed) { unsigned int peer; - GNUNET_assert(NULL == cls); + GNUNET_assert (NULL == cls); if (NULL == peers_) - { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); - return; - } - GNUNET_assert(NUM_PEERS == num_peers); + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); + return; + } + GNUNET_assert (NUM_PEERS == num_peers); for (peer = 0; peer < num_peers; peer++) - GNUNET_assert(NULL != peers_[peer]); + GNUNET_assert (NULL != peers_[peer]); peers = peers_; overlay_connects = 0; - op = GNUNET_TESTBED_overlay_configure_topology(NULL, NUM_PEERS, peers, NULL, - NULL, - NULL, - GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, - NUM_PEERS, - GNUNET_TESTBED_TOPOLOGY_OPTION_END); - GNUNET_assert(NULL != op); + op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL, + NULL, + NULL, + GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, + NUM_PEERS, + GNUNET_TESTBED_TOPOLOGY_OPTION_END); + GNUNET_assert (NULL != op); shutdown_task = - GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 300), - do_shutdown, NULL); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 300), + do_shutdown, NULL); } @@ -167,7 +167,7 @@ test_master(void *cls, * Main function */ int -main(int argc, char **argv) +main (int argc, char **argv) { uint64_t event_mask; @@ -175,10 +175,10 @@ main(int argc, char **argv) event_mask = 0; event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); - (void)GNUNET_TESTBED_test_run("test_testbed_api_test", - "test_testbed_api.conf", NUM_PEERS, - event_mask, &controller_event_cb, NULL, - &test_master, NULL); + (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", + "test_testbed_api.conf", NUM_PEERS, + event_mask, &controller_event_cb, NULL, + &test_master, NULL); if (GNUNET_OK != result) return 1; return 0; -- cgit v1.2.3