- remove adjust

[oweals/gnunet.git] / src / experimentation / test_experimentation_clique_connect.c

diff --git a/src/experimentation/test_experimentation_clique_connect.c b/src/experimentation/test_experimentation_clique_connect.c
index 9b4d0117b43862089ed1c75b88496dff36874785..f7fa02df591069ec1e560ffc7c6c27c8543e9129 100644 (file)
--- a/src/experimentation/test_experimentation_clique_connect.c
+++ b/src/experimentation/test_experimentation_clique_connect.c
@@ -26,7 +26,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 
 
@@ -94,7 +94,7 @@ struct ExperimentationPeer
 };
 
 
-struct ExperimentationPeer ph[NUM_PEERS];
+struct ExperimentationPeer bp_slaves[NUM_PEERS];
 
 /**
  * Shutdown nicely
@@ -110,9 +110,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   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)
@@ -173,12 +173,12 @@ check_end ()
 
        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))
@@ -345,6 +345,7 @@ stat_disconnect_adapter (void *cls, void *op_result)
  * 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
@@ -353,7 +354,9 @@ stat_disconnect_adapter (void *cls, void *op_result)
  *          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)
@@ -367,12 +370,12 @@ test_master (void *cls, unsigned int num_peers,
   {
     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_;