[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25510 - in gnunet/src: dht include testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25510 - in gnunet/src: dht include testbed |
Date: |
Mon, 17 Dec 2012 13:46:15 +0100 |
Author: harsha
Date: 2012-12-17 13:46:15 +0100 (Mon, 17 Dec 2012)
New Revision: 25510
Modified:
gnunet/src/dht/test_dht_multipeer.conf
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
gnunet/src/testbed/testbed_api_testbed.c
Log:
- rename TOPOLOGY_FILE to OVERLAY_TOPOLOGY_FILE and remove
GNUNET_TESTBED_create() and its friends
Modified: gnunet/src/dht/test_dht_multipeer.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer.conf 2012-12-17 12:45:51 UTC (rev
25509)
+++ gnunet/src/dht/test_dht_multipeer.conf 2012-12-17 12:46:15 UTC (rev
25510)
@@ -26,7 +26,7 @@
[testbed]
OVERLAY_TOPOLOGY = FROM_FILE
-TOPOLOGY_FILE = test_dht_multipeer_topology.dat
+OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2012-12-17 12:45:51 UTC (rev
25509)
+++ gnunet/src/include/gnunet_testbed_service.h 2012-12-17 12:46:15 UTC (rev
25510)
@@ -69,12 +69,7 @@
*/
struct GNUNET_TESTBED_Controller;
-/**
- * Handle to a large-scale testbed that is managed at a high level.
- */
-struct GNUNET_TESTBED_Testbed;
-
/**
* Create a host to run peers and controllers on.
*
@@ -1260,71 +1255,6 @@
/**
- * Configure and run a testbed using the given
- * master controller on 'num_hosts' starting
- * 'num_peers' using the given peer configuration.
- *
- * @param controller master controller for the testbed
- * (must not be destroyed until after the
- * testbed is destroyed).
- * @param num_hosts number of hosts in 'hosts', 0 to only
- * use 'localhost'
- * @param hosts list of hosts to use for the testbed
- * @param num_peers number of peers to start
- * @param cfg the configuration to use as a template for peers and also for
- * checking the value of testbed helper binary
- * @param underlay_topology underlay topology to create
- * @param va topology-specific options
- * @return handle to the testbed
- */
-struct GNUNET_TESTBED_Testbed *
-GNUNET_TESTBED_create_va (struct GNUNET_TESTBED_Controller *controller,
- unsigned int num_hosts,
- struct GNUNET_TESTBED_Host **hosts,
- unsigned int num_peers,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- enum GNUNET_TESTBED_TopologyOption underlay_topology,
- va_list va);
-
-
-/**
- * Configure and run a testbed using the given
- * master controller on 'num_hosts' starting
- * 'num_peers' using the given peer configuration.
- *
- * @param controller master controller for the testbed
- * (must not be destroyed until after the
- * testbed is destroyed).
- * @param num_hosts number of hosts in 'hosts', 0 to only
- * use 'localhost'
- * @param hosts list of hosts to use for the testbed
- * @param num_peers number of peers to start
- * @param cfg the configuration to use as a template for peers and also for
- * checking the value of testbed helper binary
- * @param underlay_topology underlay topology to create
- * @param ... topology-specific options
- */
-struct GNUNET_TESTBED_Testbed *
-GNUNET_TESTBED_create (struct GNUNET_TESTBED_Controller *controller,
- unsigned int num_hosts,
- struct GNUNET_TESTBED_Host **hosts,
- unsigned int num_peers,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- enum GNUNET_TESTBED_TopologyOption underlay_topology,
- ...);
-
-
-/**
- * Destroy a testbed. Stops all running peers and then
- * destroys all peers. Does NOT destroy the master controller.
- *
- * @param testbed testbed to destroy
- */
-void
-GNUNET_TESTBED_destroy (struct GNUNET_TESTBED_Testbed *testbed);
-
-
-/**
* Callback function to process statistic values from all peers.
*
* @param cls closure
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2012-12-17 12:45:51 UTC (rev 25509)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2012-12-17 12:46:15 UTC (rev 25510)
@@ -5,7 +5,7 @@
HOSTNAME = localhost
NEIGHBOUR_LIMIT = 100
OVERLAY_TOPOLOGY = FROM_FILE
-TOPOLOGY_FILE = overlay_topology.txt
+OVERLAY_TOPOLOGY_FILE = overlay_topology.txt
PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2012-12-17 12:45:51 UTC (rev
25509)
+++ gnunet/src/testbed/testbed_api_testbed.c 2012-12-17 12:46:15 UTC (rev
25510)
@@ -37,28 +37,7 @@
#define LOG(kind,...) \
GNUNET_log_from (kind, "testbed-api-testbed", __VA_ARGS__)
-/**
- * Opaque handle to an abstract operation to be executed by the testing
framework.
- */
-struct GNUNET_TESTBED_Testbed
-{
- /**
- * The array of hosts
- */
- struct GNUNET_TESTBED_Host **hosts;
- /**
- * The number of hosts in the hosts array
- */
- unsigned int num_hosts;
-
- /**
- * The controller handle
- */
- struct GNUNET_TESTBED_Controller *c;
-};
-
-
/**
* DLL of operations
*/
@@ -1012,11 +991,11 @@
break;
case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (rc->cfg, "testbed",
- "TOPOLOGY_FILE",
+
"OVERLAY_TOPOLOGY_FILE",
&rc->topo_file))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "testbed", "TOPOLOGY_FILE");
+ "testbed", "OVERLAY_TOPOLOGY_FILE");
goto error_cleanup;
}
break;
@@ -1069,105 +1048,4 @@
}
-/**
- * Configure and run a testbed using the given
- * master controller on 'num_hosts' starting
- * 'num_peers' using the given peer configuration.
- *
- * @param controller master controller for the testbed
- * (must not be destroyed until after the
- * testbed is destroyed).
- * @param num_hosts number of hosts in 'hosts', 0 to only
- * use 'localhost'
- * @param hosts list of hosts to use for the testbed
- * @param num_peers number of peers to start
- * @param cfg the configuration to use as a template for peers and also for
- * checking the value of testbed helper binary
- * @param underlay_topology underlay topology to create
- * @param va topology-specific options
- * @return handle to the testbed; NULL upon error (error messaage will be
printed)
- */
-struct GNUNET_TESTBED_Testbed *
-GNUNET_TESTBED_create_va (struct GNUNET_TESTBED_Controller *controller,
- unsigned int num_hosts,
- struct GNUNET_TESTBED_Host **hosts,
- unsigned int num_peers,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- enum GNUNET_TESTBED_TopologyOption underlay_topology,
- va_list va)
-{
- /* unsigned int nhost; */
-
- /* GNUNET_assert (underlay_topology < GNUNET_TESTBED_TOPOLOGY_NONE); */
- /* if (num_hosts != 0) */
- /* { */
- /* for (nhost = 0; nhost < num_hosts; nhost++) */
- /* { */
- /* if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost],
cfg)) */
- /* { */
- /* LOG (GNUNET_ERROR_TYPE_ERROR, _("Host %s cannot start testbed\n"),
*/
- /* GNUNET_TESTBED_host_get_hostname_ (hosts[nhost])); */
- /* break; */
- /* } */
- /* } */
- /* if (num_hosts != nhost) */
- /* return NULL; */
- /* } */
- /* We need controller callback here to get operation done events while
- linking hosts */
- GNUNET_break (0);
- return NULL;
-}
-
-
-/**
- * Configure and run a testbed using the given
- * master controller on 'num_hosts' starting
- * 'num_peers' using the given peer configuration.
- *
- * @param controller master controller for the testbed
- * (must not be destroyed until after the
- * testbed is destroyed).
- * @param num_hosts number of hosts in 'hosts', 0 to only
- * use 'localhost'
- * @param hosts list of hosts to use for the testbed
- * @param num_peers number of peers to start
- * @param cfg the configuration to use as a template for peers and also for
- * checking the value of testbed helper binary
- * @param underlay_topology underlay topology to create
- * @param ... topology-specific options
- */
-struct GNUNET_TESTBED_Testbed *
-GNUNET_TESTBED_create (struct GNUNET_TESTBED_Controller *controller,
- unsigned int num_hosts,
- struct GNUNET_TESTBED_Host **hosts,
- unsigned int num_peers,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- enum GNUNET_TESTBED_TopologyOption underlay_topology,
- ...)
-{
- struct GNUNET_TESTBED_Testbed *testbed;
- va_list vargs;
-
- va_start (vargs, underlay_topology);
- testbed = GNUNET_TESTBED_create_va (controller, num_hosts, hosts, num_peers,
- cfg, underlay_topology, vargs);
- va_end (vargs);
- return testbed;
-}
-
-
-/**
- * Destroy a testbed. Stops all running peers and then
- * destroys all peers. Does NOT destroy the master controller.
- *
- * @param testbed testbed to destroy
- */
-void
-GNUNET_TESTBED_destroy (struct GNUNET_TESTBED_Testbed *testbed)
-{
- GNUNET_break (0);
-}
-
-
/* end of testbed_api_testbed.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25510 - in gnunet/src: dht include testbed,
gnunet <=