-fix config, shutdown issue

[oweals/gnunet.git] / src / ats / test_ats_solver_request_and_delete_address.c

diff --git a/src/ats/test_ats_solver_request_and_delete_address.c b/src/ats/test_ats_solver_request_and_delete_address.c
index c30aaf83352208a0fecabe6af01c37ddfadcae7d..ac624f8ab9ac9dc712321387acb73b08883360b9 100644 (file)
--- a/src/ats/test_ats_solver_request_and_delete_address.c
+++ b/src/ats/test_ats_solver_request_and_delete_address.c
@@ -1,12 +1,6 @@
 /*
-  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);
-  }
  This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 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
@@ -24,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 /**
- * @file ats/test_ats_solver_add_address.c
+ * @file ats/test_ats_solver_request_and_delete_address.c
  * @brief solver test:  add address, request address, delete address and wait for disconnect
  * @author Christian Grothoff
  * @author Matthias Wachs
@@ -43,13 +37,18 @@ static struct GNUNET_SCHEDULER_Task * die_task;
 /**
  * Statistics handle
  */
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
 
 /**
  * Scheduling handle
  */
 static struct GNUNET_ATS_SchedulingHandle *sched_ats;
 
+/**
+ * Connectivity handle
+ */
+static struct GNUNET_ATS_ConnectivityHandle *connect_ats;
+
 /**
  * Return value
  */
@@ -68,7 +67,7 @@ static struct PeerContext p;
 /**
  * HELLO address
  */
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
 
 /**
  * Session
@@ -85,13 +84,19 @@ struct GNUNET_ATS_Information test_ats_info[2];
  */
 static uint32_t test_ats_count;
 
+/**
+ * The address we will delete.
+ */
+static struct GNUNET_ATS_AddressRecord *ar;
 
 static int address_deleted = GNUNET_NO;
 
+
 static int
 stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value,
         int is_persistent);
 
+
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -108,15 +113,18 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     sched_ats = NULL;
   }
 
+  if (NULL != connect_ats)
+  {
+    GNUNET_ATS_connectivity_done (connect_ats);
+    connect_ats = NULL;
+  }
   GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
   if (NULL != stats)
   {
     GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
     stats = NULL;
   }
-
   free_test_address (&test_addr);
-
   ret = 0;
 }
 
@@ -125,22 +133,19 @@ static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   die_task = NULL;
-
-  end ( NULL, NULL);
+  end (NULL, NULL);
   ret = GNUNET_SYSERR;
 }
 
+
 static void
 address_suggest_cb (void *cls,
                     const struct GNUNET_PeerIdentity *peer,
                     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)
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-
   if (GNUNET_NO == address_deleted)
   {
     /* Expected address suggestion */
@@ -150,19 +155,19 @@ address_suggest_cb (void *cls,
     GNUNET_assert (ntohl(bandwidth_out.value__) > 0);
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-        "Received sugggestion for peer `%s', deleting address\n",
-        GNUNET_i2s (&address->peer));
+                "Received sugggestion for peer `%s', deleting address\n",
+                GNUNET_i2s (&address->peer));
     address_deleted = GNUNET_YES;
-    GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, NULL);
-
+    /* Destroying address and wait for disconnect suggestion */
+    GNUNET_ATS_address_destroy (ar);
+    ar = NULL;
   }
   else
   {
     /* Expecting disconnect */
-
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Received sugggestion for peer `%s': %u %u\n",
-                GNUNET_i2s (&address->peer),
+                GNUNET_i2s (peer),
                 (unsigned int) ntohl (bandwidth_in.value__),
                 (unsigned int) ntohl (bandwidth_out.value__));
 
@@ -173,32 +178,37 @@ address_suggest_cb (void *cls,
       GNUNET_SCHEDULER_add_now (&end, NULL);
     }
   }
-  return;
 }
 
 
 static int
-stat_cb(void *cls, const char *subsystem,
-        const char *name, uint64_t value,
-        int is_persistent)
+stat_cb (void *cls, const char *subsystem,
+         const char *name, uint64_t value,
+         int is_persistent)
 {
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
-      subsystem,name, value);
-  if (GNUNET_NO == address_deleted)
-    GNUNET_ATS_suggest_address (sched_ats, &p.id);
+  static struct GNUNET_ATS_ConnectivitySuggestHandle *sh;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "ATS statistics: `%s' `%s' %llu\n",
+              subsystem,
+              name,
+              value);
+  if (NULL == sh)
+    sh = GNUNET_ATS_connectivity_suggest (connect_ats, &p.id);
   return GNUNET_OK;
 }
 
 
 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)
 {
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
   stats = GNUNET_STATISTICS_create ("ats", mycfg);
   GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
 
+  connect_ats = GNUNET_ATS_connectivity_init (mycfg);
 
   /* Connect to ATS scheduling */
   sched_ats = GNUNET_ATS_scheduling_init (mycfg, &address_suggest_cb, NULL);
@@ -230,9 +240,9 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
   test_hello_address.address_length = test_addr.addr_len;
 
   /* Adding address */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address,
-      NULL, test_ats_info, test_ats_count);
-
+  ar = GNUNET_ATS_address_add (sched_ats, &test_hello_address,
+                               NULL,
+                               test_ats_info, test_ats_count);
 }
 
 
@@ -294,4 +304,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of file test_ats_solver_add_address.c */
+/* end of file test_ats_solver_request_and_delete_address_proportional.c */