- begin work on enhanced multipart receiving

[oweals/gnunet.git] / src / ats-tests / perf_ats.c

diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index 91e9ebb50cec46591c7c46b22b529cda2e835032..f52bcfb25c578013a791ae753bb15f4ea8e478a0 100644 (file)
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -66,22 +66,33 @@ struct TestbedConnectOperation
  */
 struct BenchmarkState
 {
-  /* Are we connected to ATS service of all peers: GNUNET_YES/NO */
+  /**
+   * Are we connected to ATS service of all peers: GNUNET_YES/NO
+   */
   int connected_ATS_service;
 
-  /* Are we connected to CORE service of all peers: GNUNET_YES/NO */
+  /**
+   * Are we connected to CORE service of all peers: GNUNET_YES/NO
+   */
   int connected_COMM_service;
 
-  /* Are we connected to all peers: GNUNET_YES/NO */
+  /**
+   * Are we connected to all peers: GNUNET_YES/NO
+   */
   int connected_PEERS;
 
-  /* Are we connected to all slave peers on CORE level: GNUNET_YES/NO */
+  /**
+   * Are we connected to all slave peers on CORE level: GNUNET_YES/NO
+   */
   int connected_CORE;
 
-  /* Are we connected to CORE service of all peers: GNUNET_YES/NO */
+  /**
+   * Are we connected to CORE service of all peers: GNUNET_YES/NO
+   */
   int benchmarking;
 };
 
+
 /**
  * Shutdown task
  */
@@ -129,17 +140,18 @@ static int pref_val;
 /**
  * Number master peers
  */
-static int num_masters;
+static unsigned int num_masters;
 
 /**
  * Array of master peers
  */
-static  struct BenchmarkPeer *mps;
+static struct BenchmarkPeer *mps;
 
 /**
  * Number slave peers
  */
-static int num_slaves;
+static unsigned int num_slaves;
+
 /**
  * Array of slave peers
  */
@@ -941,13 +953,13 @@ ats_performance_info_cb (void *cls, const struct GNUNET_HELLO_Address *address,
     {
       case GNUNET_ATS_ARRAY_TERMINATOR:
         break;
-      case GNUNET_ATS_UTILIZATION_UP:
+      case GNUNET_ATS_UTILIZATION_OUT:
         if (p->ats_utilization_up != ntohl (ats[c_a].value))
             log = GNUNET_YES;
         p->ats_utilization_up = ntohl (ats[c_a].value);
 
         break;
-      case GNUNET_ATS_UTILIZATION_DOWN:
+      case GNUNET_ATS_UTILIZATION_IN:
         if (p->ats_utilization_down != ntohl (ats[c_a].value))
             log = GNUNET_YES;
         p->ats_utilization_down = ntohl (ats[c_a].value);
@@ -1101,9 +1113,11 @@ peerinformation_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
  *          failed
  */
 static void
-main_run (void *cls, struct GNUNET_TESTBED_RunHandle *h, unsigned int num_peers,
-    struct GNUNET_TESTBED_Peer **peers_, unsigned int links_succeeded,
-    unsigned int links_failed)
+main_run (void *cls, struct GNUNET_TESTBED_RunHandle *h,
+          unsigned int num_peers,
+          struct GNUNET_TESTBED_Peer **peers_,
+          unsigned int links_succeeded,
+          unsigned int links_failed)
 {
   int c_m;
   int c_s;
@@ -1129,7 +1143,7 @@ main_run (void *cls, struct GNUNET_TESTBED_RunHandle *h, unsigned int num_peers,
     mps[c_m].pref_partner = &sps[c_m];
     mps[c_m].pref_value = TEST_ATS_PREFRENCE_START;
     mps[c_m].partners =
-        GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer));
+        GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPartner));
     mps[c_m].num_partners = num_slaves;
     /* Initialize partners */
     for (c_s = 0; c_s < num_slaves; c_s++)
@@ -1149,7 +1163,7 @@ main_run (void *cls, struct GNUNET_TESTBED_RunHandle *h, unsigned int num_peers,
     sps[c_s].no = c_s + num_masters;
     sps[c_s].master = GNUNET_NO;
     sps[c_s].partners =
-        GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer));
+        GNUNET_malloc (num_masters * sizeof (struct BenchmarkPartner));
     sps[c_s].num_partners = num_masters;
     /* Initialize partners */
     for (c_m = 0; c_m < num_masters; c_m++)