*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_testbed_service.h"
};
-struct ExperimentationPeer ph[NUM_PEERS];
+struct ExperimentationPeer bp_slaves[NUM_PEERS];
/**
* Shutdown nicely
for (peer = 0; peer < NUM_PEERS; peer++)
{
- if (NULL != ph[peer].stat_op)
- GNUNET_TESTBED_operation_done (ph[peer].stat_op);
- ph[peer].stat_op = NULL;
+ if (NULL != bp_slaves[peer].stat_op)
+ GNUNET_TESTBED_operation_done (bp_slaves[peer].stat_op);
+ bp_slaves[peer].stat_op = NULL;
}
if (NULL != op)
for (peer = 0; peer < NUM_PEERS; peer++)
{
- total_active += ph[peer].active_nodes;
- total_requested += ph[peer].requested_nodes;
- total_inactive += ph[peer].inactive_nodes;
- if (NUM_ISSUER == ph[peer].issuer)
+ total_active += bp_slaves[peer].active_nodes;
+ total_requested += bp_slaves[peer].requested_nodes;
+ total_inactive += bp_slaves[peer].inactive_nodes;
+ if (NUM_ISSUER == bp_slaves[peer].issuer)
issuer ++;
- if (NUM_EXPERIMENTS == ph[peer].experiments)
+ if (NUM_EXPERIMENTS == bp_slaves[peer].experiments)
experiments ++;
}
if ((last_issuer_value < issuer) && (issuer == NUM_PEERS))
* 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 links_succeeded the number of overlay link connection attempts that
* failed
*/
static void
-test_master (void *cls, unsigned int num_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)
{
GNUNET_assert (NULL != peers_[peer]);
/* Connect to peer's statistic service */
- ph[peer].stat_op = GNUNET_TESTBED_service_connect (NULL,
+ bp_slaves[peer].stat_op = GNUNET_TESTBED_service_connect (NULL,
peers_[peer], "statistics",
- &stat_comp_cb, &ph[peer],
+ &stat_comp_cb, &bp_slaves[peer],
&stat_connect_adapter,
&stat_disconnect_adapter,
- &ph[peer]);
+ &bp_slaves[peer]);
}
peers = peers_;