diff options
| -rw-r--r-- | src/testbed/Makefile.am | 2 | ||||
| -rw-r--r-- | src/testbed/gnunet-service-testbed_barriers.c | 2 | ||||
| -rw-r--r-- | src/testbed/testbed_api.c | 1 | ||||
| -rw-r--r-- | src/testbed/testbed_api.h | 37 | ||||
| -rw-r--r-- | src/testbed/testbed_api_barriers.c | 4 | ||||
| -rw-r--r-- | src/testbed/testbed_api_barriers.h | 68 |
6 files changed, 40 insertions, 74 deletions
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index b5a7758f01..9c1bfcce68 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am @@ -45,7 +45,7 @@ gnunet_service_testbed_SOURCES = \ gnunet-service-testbed_oc.c \ gnunet-service-testbed_cpustatus.c \ gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \ - gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \ + gnunet-service-testbed_barriers.c \ gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h gnunet_service_testbed_LDADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la \ diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c index 5b081ed12e..d8545ad047 100644 --- a/src/testbed/gnunet-service-testbed_barriers.c +++ b/src/testbed/gnunet-service-testbed_barriers.c @@ -26,7 +26,7 @@ #include "gnunet-service-testbed.h" #include "gnunet-service-testbed_barriers.h" -#include "testbed_api_barriers.h" +#include "testbed_api.h" /** diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 67b1e8c96b..9b80664124 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -36,7 +36,6 @@ #include "testbed.h" #include "testbed_api.h" -#include "testbed_api_barriers.h" #include "testbed_api_hosts.h" #include "testbed_api_peers.h" #include "testbed_api_operations.h" diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h index 7a8e6539a0..cd3358c9a8 100644 --- a/src/testbed/testbed_api.h +++ b/src/testbed/testbed_api.h @@ -505,5 +505,42 @@ GNUNET_TESTBED_get_slave_config_ (void *op_cls, uint32_t slave_host_id); + +/** + * Initialise a barrier and call the given callback when the required percentage + * of peers (quorum) reach the barrier OR upon error. + * + * @param controller the handle to the controller + * @param name identification name of the barrier + * @param quorum the percentage of peers that is required to reach the barrier. + * Peers signal reaching a barrier by calling + * GNUNET_TESTBED_barrier_reached(). + * @param cb the callback to call when the barrier is reached or upon error. + * Cannot be NULL. + * @param cls closure for the above callback + * @param echo #GNUNET_YES to echo the barrier crossed status message back to the + * controller + * @return barrier handle; NULL upon error + */ +struct GNUNET_TESTBED_Barrier * +GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller, + const char *name, + unsigned int quorum, + GNUNET_TESTBED_barrier_status_cb cb, + void *cls, + int echo); + + +/** + * Remove a barrier and it was the last one in the barrier hash map, destroy the + * hash map + * + * @param barrier the barrier to remove + */ +void +GNUNET_TESTBED_barrier_remove_ (struct GNUNET_TESTBED_Barrier *barrier); + + + #endif /* end of testbed_api.h */ diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index deb8ca97f6..527a86554b 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2008--2013 GNUnet e.V. + Copyright (C) 2008--2013, 2016 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 @@ -23,11 +23,9 @@ * @brief API implementation for testbed barriers * @author Sree Harsha Totakura <sreeharsha@totakura.in> */ - #include "platform.h" #include "gnunet_testbed_service.h" #include "testbed_api.h" -#include "testbed_api_barriers.h" /** * Logging shorthand diff --git a/src/testbed/testbed_api_barriers.h b/src/testbed/testbed_api_barriers.h deleted file mode 100644 index b839a4ce49..0000000000 --- a/src/testbed/testbed_api_barriers.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - 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 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. - - 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -/** - * @file testbed/testbed_api_barriers.h - * @brief interface for barriers API function that are used internally (not - * exposed as user API) - * @author Sree Harsha Totakura <sreeharsha@totakura.in> - */ -#ifndef TESTBED_API_BARRIERS_H -#define TESTBED_API_BARRIERS_H - -#include "gnunet_testbed_service.h" - - -/** - * Initialise a barrier and call the given callback when the required percentage - * of peers (quorum) reach the barrier OR upon error. - * - * @param controller the handle to the controller - * @param name identification name of the barrier - * @param quorum the percentage of peers that is required to reach the barrier. - * Peers signal reaching a barrier by calling - * GNUNET_TESTBED_barrier_reached(). - * @param cb the callback to call when the barrier is reached or upon error. - * Cannot be NULL. - * @param cls closure for the above callback - * @param echo #GNUNET_YES to echo the barrier crossed status message back to the - * controller - * @return barrier handle; NULL upon error - */ -struct GNUNET_TESTBED_Barrier * -GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller, - const char *name, - unsigned int quorum, - GNUNET_TESTBED_barrier_status_cb cb, - void *cls, - int echo); - - -/** - * Remove a barrier and it was the last one in the barrier hash map, destroy the - * hash map - * - * @param barrier the barrier to remove - */ -void -GNUNET_TESTBED_barrier_remove_ (struct GNUNET_TESTBED_Barrier *barrier); - - -#endif |