[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37396 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37396 - gnunet/src/testbed |
Date: |
Mon, 27 Jun 2016 16:08:01 +0200 |
Author: grothoff
Date: 2016-06-27 16:08:01 +0200 (Mon, 27 Jun 2016)
New Revision: 37396
Removed:
gnunet/src/testbed/testbed_api_barriers.h
Modified:
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/gnunet-service-testbed_barriers.c
gnunet/src/testbed/testbed_api.c
gnunet/src/testbed/testbed_api.h
gnunet/src/testbed/testbed_api_barriers.c
Log:
move functions unrelated to TESTBED_BarrierWaitHandle out of
testbed_api_barriers.c
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2016-06-27 14:06:26 UTC (rev 37395)
+++ gnunet/src/testbed/Makefile.am 2016-06-27 14:08:01 UTC (rev 37396)
@@ -45,7 +45,7 @@
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 \
Modified: gnunet/src/testbed/gnunet-service-testbed_barriers.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_barriers.c 2016-06-27
14:06:26 UTC (rev 37395)
+++ gnunet/src/testbed/gnunet-service-testbed_barriers.c 2016-06-27
14:08:01 UTC (rev 37396)
@@ -26,7 +26,7 @@
#include "gnunet-service-testbed.h"
#include "gnunet-service-testbed_barriers.h"
-#include "testbed_api_barriers.h"
+#include "testbed_api.h"
/**
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2016-06-27 14:06:26 UTC (rev 37395)
+++ gnunet/src/testbed/testbed_api.c 2016-06-27 14:08:01 UTC (rev 37396)
@@ -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"
Modified: gnunet/src/testbed/testbed_api.h
===================================================================
--- gnunet/src/testbed/testbed_api.h 2016-06-27 14:06:26 UTC (rev 37395)
+++ gnunet/src/testbed/testbed_api.h 2016-06-27 14:08:01 UTC (rev 37396)
@@ -505,5 +505,42 @@
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 */
Modified: gnunet/src/testbed/testbed_api_barriers.c
===================================================================
--- gnunet/src/testbed/testbed_api_barriers.c 2016-06-27 14:06:26 UTC (rev
37395)
+++ gnunet/src/testbed/testbed_api_barriers.c 2016-06-27 14:08:01 UTC (rev
37396)
@@ -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 <address@hidden>
*/
-
#include "platform.h"
#include "gnunet_testbed_service.h"
#include "testbed_api.h"
-#include "testbed_api_barriers.h"
/**
* Logging shorthand
Deleted: gnunet/src/testbed/testbed_api_barriers.h
===================================================================
--- gnunet/src/testbed/testbed_api_barriers.h 2016-06-27 14:06:26 UTC (rev
37395)
+++ gnunet/src/testbed/testbed_api_barriers.h 2016-06-27 14:08:01 UTC (rev
37396)
@@ -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 <address@hidden>
- */
-#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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37396 - gnunet/src/testbed,
gnunet <=