[GNUnet-SVN] r34628 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2014-12-15 19:36:57 +0100 (Mon, 15 Dec 2014)
New Revision: 34628

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_performance.c
   gnunet/src/ats/test_ats_api.conf
   gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c
Log:
-fix test: only run test logic, not full peer

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2014-12-15 18:10:18 UTC 
(rev 34627)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2014-12-15 18:36:57 UTC 
(rev 34628)
@@ -2239,7 +2239,7 @@
               addr->atsi, addr->atsi_count,
               GNUNET_BANDWIDTH_value_init (addr->assigned_bw_out),
               GNUNET_BANDWIDTH_value_init (addr->assigned_bw_in));
-  return GNUNET_YES;
+  return GNUNET_OK;
 }
 
 
@@ -2265,6 +2265,12 @@
     GNUNET_break (0);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Returning information for %s from a total of %u known 
addresses\n",
+              (NULL == peer)
+              ? "all peers"
+              : GNUNET_i2s (peer),
+              (unsigned int) GNUNET_CONTAINER_multipeermap_size 
(handle->addresses));
   pi_ctx.it = pi_it;
   pi_ctx.it_cls = pi_it_cls;
   if (NULL == peer)

Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c     2014-12-15 18:10:18 UTC 
(rev 34627)
+++ gnunet/src/ats/gnunet-service-ats_performance.c     2014-12-15 18:36:57 UTC 
(rev 34628)
@@ -541,6 +541,9 @@
                                  &req_addr_peerinfo_it,
                                  &ai);
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Finished handling `%s' message\n",
+              "ADDRESSLIST_REQUEST");
   transmit_req_addr (&ai,
                      NULL, NULL, NULL,
                      0, GNUNET_NO,

Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf    2014-12-15 18:10:18 UTC (rev 34627)
+++ gnunet/src/ats/test_ats_api.conf    2014-12-15 18:36:57 UTC (rev 34628)
@@ -1,3 +1,5 @@
address@hidden@ ../../contrib/no_forcestart.conf
+
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 

Modified: gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c       
2014-12-15 18:10:18 UTC (rev 34627)
+++ gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c       
2014-12-15 18:36:57 UTC (rev 34628)
@@ -181,19 +181,16 @@
     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 != phal)
   {
     GNUNET_ATS_performance_list_addresses_cancel (phal);
     phal = NULL;
   }
-
   if (NULL != perf_ats)
   {
     GNUNET_ATS_performance_done (perf_ats);
@@ -242,8 +239,9 @@
 
 
 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;
   cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
@@ -274,8 +272,9 @@
   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));
+  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";
@@ -298,11 +297,13 @@
   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));
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Created peer 1: `%s'\n",
+             GNUNET_i2s (&p[1].id));
 
   /* Add addresses */
-  sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL );
+  sched_ats = GNUNET_ATS_scheduling_init (cfg,
+                                          &address_suggest_cb, NULL);
   if (NULL == sched_ats)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,