X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftest_testbed_api_topology.c;h=dada7286ff1db912dd9060e8292c310a2d9e8e27;hb=d17a17ea785f91c18b5694eab3372c4e4564d95e;hp=8e673d29378d5e158c25e558bc533643b47de096;hpb=6a73109cec17bc4ed3101e7793bbb08ddd93606d;p=oweals%2Fgnunet.git diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index 8e673d293..dada7286f 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c @@ -1,22 +1,22 @@ /* - This file is part of GNUnet - (C) 2008--2012 Christian Grothoff (and other contributing authors) + This file is part of GNUnet + Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + + SPDX-License-Identifier: AGPL3.0-or-later + */ /** * @file src/testbed/test_testbed_api_topology.c @@ -25,13 +25,13 @@ */ #include "platform.h" -#include "gnunet_common.h" +#include "gnunet_util_lib.h" #include "gnunet_testbed_service.h" /** * Number of peers we want to start */ -#define NUM_PEERS 50 +#define NUM_PEERS 10 /** * Array of peers @@ -46,7 +46,7 @@ static struct GNUNET_TESTBED_Operation *op; /** * Shutdown task */ -static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; +static struct GNUNET_SCHEDULER_Task *shutdown_task; /** * Testing result @@ -63,12 +63,11 @@ static unsigned int overlay_connects; * Shutdown nicely * * @param cls NULL - * @param tc the task context */ static void -do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +do_shutdown (void *cls) { - shutdown_task = GNUNET_SCHEDULER_NO_TASK; + shutdown_task = NULL; if (NULL != op) { GNUNET_TESTBED_operation_done (op); @@ -77,6 +76,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_SCHEDULER_shutdown (); } + /** * Controller event callback * @@ -94,15 +94,18 @@ controller_event_cb (void *cls, if ((NUM_PEERS) == overlay_connects) { result = GNUNET_OK; - GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + 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) && + 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", @@ -110,7 +113,7 @@ controller_event_cb (void *cls, result = GNUNET_SYSERR; GNUNET_SCHEDULER_cancel (shutdown_task); shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); - } + } } @@ -118,29 +121,46 @@ controller_event_cb (void *cls, * Signature of a main function for a testcase. * * @param cls closure + * @param h the run handle * @param num_peers number of peers in 'peers' - * @param peers handle to peers run in the testbed + * @param peers_ handle to peers run in the testbed + * @param links_succeeded the number of overlay link connection attempts that + * succeeded + * @param links_failed the number of overlay link connection attempts that + * failed */ static void -test_master (void *cls, unsigned int num_peers, - struct GNUNET_TESTBED_Peer **peers_) +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); + if (NULL == peers_) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); + return; + } GNUNET_assert (NUM_PEERS == num_peers); - GNUNET_assert (NULL != peers_); for (peer = 0; peer < num_peers; peer++) GNUNET_assert (NULL != peers_[peer]); peers = peers_; overlay_connects = 0; - op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, - GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, - NUM_PEERS); + 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, 120), - do_shutdown, NULL); + shutdown_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 300), + do_shutdown, NULL); } @@ -156,12 +176,14 @@ main (int argc, char **argv) event_mask = 0; event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); - 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; } + /* end of test_testbed_api_topology.c */