added simulation
[oweals/gnunet.git] / src / ats / test_ats_api_performance_monitor.c
index 95c65c68fae26a92b43fe0ee439946b8ad5c4271..887a139e846c4971b5d5636fc29c63215a37b2dd 100644 (file)
@@ -1,26 +1,25 @@
 /*
    This file is part of GNUnet.
    (C) 2010,2011 Christian Grothoff (and other contributing authors)
-
    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., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
-*/
+ This file is part of GNUnet.
+ (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+ 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
 /**
  * @file ats/test_ats_api_performance_monitor.c
- * @brief Test performance API:
- *                             Add an address for a peer and request it. We expect an monitor callback
+ * @brief test performance API's address monitor feature
  * @author Christian Grothoff
  * @author Matthias Wachs
  */
 #include "gnunet_testing_lib.h"
 #include "ats.h"
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
-#define SHUTDOWN_CORRECT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-#define ATS_COUNT 2
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
-static GNUNET_SCHEDULER_TaskIdentifier stage_task;
 
-struct GNUNET_CONFIGURATION_Handle *cfg;
+/**
+ * Statistics handle
+ */
+struct GNUNET_STATISTICS_Handle *stats;
 
-static struct GNUNET_ATS_SchedulingHandle *sh;
+/**
+ * Configuration handle
+ */
+struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_ATS_PerformanceHandle *ph;
+/**
+ * ATS scheduling handle
+ */
+static struct GNUNET_ATS_SchedulingHandle *sched_ats;
 
-static struct GNUNET_HELLO_Address addr[2];
+/**
+ * ATS performance handle
+ */
+static struct GNUNET_ATS_PerformanceHandle *perf_ats;
 
-static struct GNUNET_ATS_Information atsi[ATS_COUNT];
+struct GNUNET_ATS_AddressListHandle* phal;
 
 static int ret;
 
-static int res_suggest_cb_p0;
-static int res_suggest_cb_p1;
-
-static int res_perf_cb_p0;
-static int res_perf_cb_p1;
+struct Address
+{
+  char *plugin;
+  size_t plugin_len;
 
-/**
- * Stage 0: Init, request address and wait for peer0 suggest cb
- * Stage 1: Got peer0 suggest cb, expect monitoring cb
- * Stage 2: Got peer0 monitoring cb, update address and expect monitor cb
- * Stage 3: Got 2nd peer0 monitoring cb, shutdown
- */
+  void *addr;
+  size_t addr_len;
 
-static int stage;
+  struct GNUNET_ATS_Information *ats;
+  int ats_count;
 
+  void *session;
+};
 
-static void cleanup_addresses ()
+struct PeerContext
 {
-       GNUNET_ATS_address_destroyed (sh, &addr[0], NULL);
-       GNUNET_ATS_address_destroyed (sh, &addr[1], NULL);
-}
+  struct GNUNET_PeerIdentity id;
 
-static void setup_addresses ()
-{
-       memset (&addr[0].peer,'\0', sizeof (addr[0].peer));
-       addr[0].transport_name = "test0";
-       addr[0].address = "test_addr0";
-       addr[0].address_length = strlen ("test_addr0") + 1;
+  struct Address *addr;
+};
 
-       atsi[0].type = htonl(GNUNET_ATS_QUALITY_NET_DELAY);
-       atsi[0].value = htonl(100);
+static struct PeerContext p[2];
 
-       atsi[1].type = htonl(GNUNET_ATS_QUALITY_NET_DISTANCE);
-       atsi[1].value = htonl(5);
+static struct Address p0_addresses[2];
+static struct Address p1_addresses[2];
 
-       GNUNET_ATS_address_add (sh, &addr[0], NULL, atsi, ATS_COUNT);
+struct GNUNET_HELLO_Address p0_ha[2];
+struct GNUNET_HELLO_Address p1_ha[2];
+struct GNUNET_HELLO_Address *s_ha[2];
 
-       memset (&addr[1].peer,'\1', sizeof (addr[1].peer));
-       addr[1].transport_name = "test1";
-       addr[1].address = "test_addr1";
-       addr[1].address_length = strlen ("test_addr1") + 1;
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
-       GNUNET_ATS_address_add (sh, &addr[1], NULL, atsi, ATS_COUNT);
-}
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
 static void
-end_now (int res)
+ats_perf_cb (void *cls,
+            const struct GNUNET_HELLO_Address *address,
+            int address_active,
+            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+            const struct GNUNET_ATS_Information *ats,
+            uint32_t ats_count)
 {
-       if (GNUNET_SCHEDULER_NO_TASK != stage_task)
-       {
-                       GNUNET_SCHEDULER_cancel (stage_task);
-                       stage_task = GNUNET_SCHEDULER_NO_TASK;
-       }
-       if (GNUNET_SCHEDULER_NO_TASK != die_task)
-       {
-                       GNUNET_SCHEDULER_cancel (die_task);
-                       die_task = GNUNET_SCHEDULER_NO_TASK;
-       }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown\n");
-
-       cleanup_addresses ();
-
-       if (NULL != ph)
-       {
-               GNUNET_ATS_performance_done (ph);
-               ph = NULL;
-       }
-
-       if (NULL != sh)
-       {
-               GNUNET_ATS_scheduling_done (sh);
-               sh = NULL;
-       }
-       ret = res;
+  static int peer0 = GNUNET_NO;
+  static int peer1 = GNUNET_NO;
+  static int done = GNUNET_NO;
+  if ((GNUNET_NO == peer0) && (0 == memcmp (address, &p[0].id, sizeof (p[0].id))))
+  {
+    peer0 = GNUNET_YES;
+  }
+  if ((GNUNET_NO == peer0) && (0 == memcmp (address, &p[1].id, sizeof (p[1].id))))
+  {
+    peer1 = GNUNET_YES;
+  }
+  if ((peer0 == GNUNET_YES) && (peer1 = GNUNET_YES) && (GNUNET_NO == done))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+        "Done\n");
+    done = GNUNET_YES;
+    GNUNET_SCHEDULER_add_now (&end, NULL);
+
+  }
 }
 
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error!\n");
-  if (GNUNET_NO == res_perf_cb_p0)
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not get performance information for requested peer!\n");
-  if (GNUNET_YES == res_perf_cb_p1)
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got suggestion for not requested peer!\n");
-  if (GNUNET_NO == res_suggest_cb_p0)
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not get suggestion for not peer!\n");
-  if (GNUNET_YES == res_suggest_cb_p1)
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got suggestion for not requested peer!\n");
-  end_now (1);
-}
 
-static void
-next_stage (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static int
+stat_cb(void *cls, const char *subsystem,
+        const char *name, uint64_t value,
+        int is_persistent)
 {
-       static int stage_counter = 0;
-
-       stage_task = GNUNET_SCHEDULER_NO_TASK;
-       if (0 == stage_counter)
-       {
-               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stop performance monitoring\n");
-
-               stage_task = GNUNET_SCHEDULER_add_delayed (SHUTDOWN_CORRECT, &next_stage, NULL);
-               stage_counter++;
-               return;
-       }
-       if (1 == stage_counter)
-       {
-
-       }
-       else
-       {
-                       end_now (1);
-       }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
+      subsystem,name, value);
+  if (4 == value)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+        "All addresses added\n");
+  }
+
+  return GNUNET_OK;
+
 }
 
-static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+                    struct Session *session,
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+                    const struct GNUNET_ATS_Information *atsi,
+                    uint32_t ats_count)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Success\n");
-  end_now (0);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+  GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  return;
 }
 
 
 static void
-perf_mon_cb (void *cls,
-                                               const struct GNUNET_PeerIdentity *peer,
-                                               const struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                                               const struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                                               const struct GNUNET_ATS_Information *ats,
-                                               uint32_t ats_count)
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-       int c1;
-       int c2;
-       int c3;
-
-       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                       "ATS notifies about perfomance change for peer `%s'\n", GNUNET_i2s (peer));
-
-       if ((1 != stage) && (2 != stage))
-       {
-               GNUNET_break (0);
-               end_now(1);
-               return;
-       }
-
-       if (1 == stage)
-       {
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received 1st callback for peer `%s' with %u information\n",
-                                       GNUNET_i2s (&addr[0].peer), ats_count);
-                       if (0 != memcmp (peer, &addr[0].peer, sizeof (addr[0].peer)))
-                       {
-                                       res_perf_cb_p1 = GNUNET_YES;
-                                       GNUNET_break (0);
-                                       if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                                               GNUNET_SCHEDULER_cancel (die_task);
-                                       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-                                       return;
-                       }
-
-                       if (ats_count < ATS_COUNT)
-                       {
-                                       GNUNET_break (0);
-                                       if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                                               GNUNET_SCHEDULER_cancel (die_task);
-                                       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-                                       return;
-                       }
-
-                       c3 = 0;
-                       for (c1 = 0; c1 < ats_count; c1++)
-                       {
-                               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS information [%u] %u : %u \n",
-                                               c1, ntohl (ats[c1].type), ntohl (ats[c1].value));
-                               for (c2 = 0; c2 < ATS_COUNT; c2++)
-                               {
-                                       if (ats[c1].type == atsi[c2].type)
-                                       {
-                                               if (ats[c1].value == atsi[c2].value)
-                                                               c3++;
-                                               else
-                                                               GNUNET_break (0);
-                                       }
-                               }
-                       }
-                       if (ATS_COUNT != c3)
-                       {
-                               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received only %u correct ATS information \n", c3);
-                               if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                                       GNUNET_SCHEDULER_cancel (die_task);
-                               die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-                               return;
-                       }
-
-                       /* Everything OK */
-                       stage ++;
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %u correct ATS information \n", c3);
-
-                       atsi[0].type = htonl(GNUNET_ATS_QUALITY_NET_DELAY);
-                       atsi[0].value = htonl(1000);
-
-                       atsi[1].type = htonl(GNUNET_ATS_QUALITY_NET_DISTANCE);
-                       atsi[1].value = htonl(50);
-
-                       GNUNET_ATS_address_update (sh, &addr[0], NULL, atsi, ATS_COUNT);
-                       return;
-       }
-       if (2 == stage)
-       {
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received 2nd callback for peer `%s' with %u information\n",
-                                       GNUNET_i2s (&addr[0].peer), ats_count);
-                       if (0 != memcmp (peer, &addr[0].peer, sizeof (addr[0].peer)))
-                       {
-                                       res_perf_cb_p1 = GNUNET_YES;
-                                       GNUNET_break (0);
-                                       if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                                               GNUNET_SCHEDULER_cancel (die_task);
-                                       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-                                       return;
-                       }
-
-                       if (ats_count < ATS_COUNT)
-                       {
-                                       GNUNET_break (0);
-                                       if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                                               GNUNET_SCHEDULER_cancel (die_task);
-                                       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-                                       return;
-                       }
-
-
-                       c3 = 0;
-                       for (c1 = 0; c1 < ats_count; c1++)
-                       {
-                               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS information [%u] %u : %u \n",
-                                               c1, ntohl (ats[c1].type), ntohl (ats[c1].value));
-                               for (c2 = 0; c2 < ATS_COUNT; c2++)
-                               {
-                                       if (ats[c1].type == atsi[c2].type)
-                                       {
-                                               if (ats[c1].value == atsi[c2].value)
-                                                               c3++;
-                                               else
-                                               {
-                                                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS information [%u] should be %u, but is %u \n",
-                                                                       ntohl (ats[c1].type), ntohl(atsi[c2].value),  ntohl (ats[c1].value));
-                                                               GNUNET_break (0);
-                                               }
-                                       }
-                               }
-                       }
-                       if (ATS_COUNT != c3)
-                       {
-                               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received only %u correct ATS information \n", c3);
-                               if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                                       GNUNET_SCHEDULER_cancel (die_task);
-                               die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-                               return;
-                       }
-
-                       /* Everything OK */
-                       stage ++;
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %u correct ATS information \n", c3);
-                       GNUNET_SCHEDULER_add_now (&end, NULL);
-                       return;
-       }
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  end ( NULL, NULL);
+  ret = GNUNET_SYSERR;
 }
 
-void ats_suggest_cb (void *cls,
-                                                                               const struct GNUNET_HELLO_Address * address,
-                                                                               struct Session * session,
-                                                                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                                                                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                                                                               const struct GNUNET_ATS_Information *ats,
-                                                                               uint32_t ats_count)
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                       "ATS is suggesting address for peer `%s'\n", GNUNET_i2s (&address->peer));
-
-       if (0 != stage)
-       {
-               GNUNET_break (0);
-               end_now(1);
-               return;
-       }
-
-       if (0 == memcmp (&addr[0].peer, &address->peer, sizeof (address->peer)))
-       {
-               res_suggest_cb_p0 = GNUNET_YES;
-               stage = 1;
-       }
-       if (0 == memcmp (&addr[1].peer, &address->peer, sizeof (address->peer)))
-               res_suggest_cb_p1 = GNUNET_YES;
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
+  if (die_task != GNUNET_SCHEDULER_NO_TASK )
+  {
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  if (NULL != sched_ats)
+  {
+    GNUNET_ATS_scheduling_done (sched_ats);
+    sched_ats = NULL;
+  }
+
+  if (NULL != perf_ats)
+  {
+    GNUNET_ATS_performance_done (perf_ats);
+    perf_ats = NULL;
+  }
+
+  GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
+  if (NULL != stats)
+  {
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    stats = NULL;
+  }
+
+
+  GNUNET_free_non_null(p0_addresses[0].addr);
+  GNUNET_free_non_null(p0_addresses[1].addr);
+  GNUNET_free_non_null(p1_addresses[0].addr);
+  GNUNET_free_non_null(p1_addresses[1].addr);
+
+  ret = 0;
 }
 
-
 static void
-run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *mycfg,
-     struct GNUNET_TESTING_Peer *peer)
+run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
+    struct GNUNET_TESTING_Peer *peer)
 {
   ret = 1;
-  stage = 0;
   cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-
-  sh = GNUNET_ATS_scheduling_init (cfg, &ats_suggest_cb, NULL);
-  GNUNET_assert (NULL != sh);
-
-  ph = GNUNET_ATS_performance_init (cfg, &perf_mon_cb, &ret, NULL, NULL);
-  GNUNET_assert (NULL != ph);
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL );
+
+  if (NULL == (perf_ats = GNUNET_ATS_performance_init (cfg, &ats_perf_cb, NULL)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+        "Failed to connect to performance API\n");
+    GNUNET_SCHEDULER_add_now (end_badly, NULL);
+  }
+
+
+  stats = GNUNET_STATISTICS_create ("ats", cfg);
+  GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
+
+  /* set up peer 0 */
+  memset (&p[0].id, '1', sizeof (p[0].id));
+  p0_addresses[0].plugin = "test";
+  p0_addresses[0].session = NULL;
+  p0_addresses[0].addr = GNUNET_strdup ("test_p0_a0");
+  p0_addresses[0].addr_len = strlen (p0_addresses[0].addr) + 1;
+
+  p0_ha[0].address = p0_addresses[0].addr;
+  p0_ha[0].address_length = p0_addresses[0].addr_len;
+  p0_ha[0].peer = p[0].id;
+  p0_ha[0].transport_name = p0_addresses[0].plugin;
+
+  p0_addresses[1].plugin = "test";
+  p0_addresses[1].session = NULL;
+  p0_addresses[1].addr = GNUNET_strdup ("test_p0_a1");
+  p0_addresses[1].addr_len = strlen (p0_addresses[1].addr) + 1;
+
+  p0_ha[1].address = p0_addresses[1].addr;
+  p0_ha[1].address_length = p0_addresses[1].addr_len;
+  p0_ha[1].peer = p[0].id;
+  p0_ha[1].transport_name = p0_addresses[1].plugin;
+
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Created peer 0: `%s'\n",
+      GNUNET_i2s (&p[0].id));
+
+  memset (&p[1].id, '2', sizeof (p[1].id));
+  p1_addresses[0].plugin = "test";
+  p1_addresses[0].session = NULL;
+  p1_addresses[0].addr = GNUNET_strdup ("test_p1_a0");
+  p1_addresses[0].addr_len = strlen (p1_addresses[0].addr) + 1;
+
+  p1_ha[0].address = p1_addresses[0].addr;
+  p1_ha[0].address_length = p1_addresses[0].addr_len;
+  p1_ha[0].peer = p[1].id;
+  p1_ha[0].transport_name = p1_addresses[0].plugin;
+
+  p1_addresses[1].plugin = "test";
+  p1_addresses[1].session = NULL;
+  p1_addresses[1].addr = GNUNET_strdup ("test_p1_a1");
+  p1_addresses[1].addr_len = strlen (p1_addresses[1].addr) + 1;
+
+  p1_ha[1].address = p1_addresses[1].addr;
+  p1_ha[1].address_length = p1_addresses[1].addr_len;
+  p1_ha[1].peer = p[1].id;
+  p1_ha[1].transport_name = p1_addresses[1].plugin;
+
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Created peer 1: `%s'\n",
+      GNUNET_i2s (&p[1].id));
 
   /* Add addresses */
-  setup_addresses ();
-
-  /* Get an active address for peer0 and expect callback */
-  GNUNET_ATS_suggest_address (sh, &addr[0].peer);
+  sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL );
+  if (sched_ats == NULL )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
+
+  GNUNET_ATS_address_add (sched_ats, &p0_ha[0], NULL, NULL, 0);
+  GNUNET_ATS_address_add (sched_ats, &p0_ha[1], NULL, NULL, 0);
+
+  GNUNET_ATS_address_add (sched_ats, &p1_ha[0], NULL, NULL, 0);
+  GNUNET_ATS_address_add (sched_ats, &p1_ha[1], NULL, NULL, 0);
 }
 
-
 int
 main (int argc, char *argv[])
 {
-  if (0 != GNUNET_TESTING_peer_run ("test_ats_api_performance_monitor",
-                                   "test_ats_api.conf",
-                                   &run, NULL))
+  if (0
+      != GNUNET_TESTING_peer_run ("test_ats_api_performance",
+          "test_ats_api.conf", &run, NULL ))
     return 1;
   return ret;
 }