fixing #3657 (replace ATS_Information with struct), but WIHTOUT fixing ATS testcases yet

3 files changed, 17 insertions, 33 deletions

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 1ff0f0496..260ffc902 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -241,14 +241,13 @@ GSF_test_get_load_too_high_ (uint32_t priority)
 /**
  * We've received peer performance information. Update
  * our running average for the P2P latency.
-*
+ *
  * @param cls closure
  * @param address the address
  * @param active is this address in active use
  * @param bandwidth_out assigned outbound bandwidth for the connection
  * @param bandwidth_in assigned inbound bandwidth for the connection
- * @param ats performance data for the address (as far as known)
- * @param ats_count number of performance records in @a ats
+ * @param prop performance data for the address (as far as known)
  */
 static void
 update_latencies (void *cls,
@@ -256,12 +255,8 @@ update_latencies (void *cls,
                   int active,
                   struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                   struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                  const struct GNUNET_ATS_Information *ats,
-                  uint32_t ats_count)
+                  const struct GNUNET_ATS_Properties *prop)
 {
-  unsigned int i;
-  struct GNUNET_TIME_Relative latency;
-
   if (NULL == address)
   {
     /* ATS service temporarily disconnected */
@@ -270,22 +265,15 @@ update_latencies (void *cls,
 
   if (GNUNET_YES != active)
     return;
-  for (i = 0; i < ats_count; i++)
-  {
-    if (GNUNET_ATS_QUALITY_NET_DELAY != ntohl (ats[i].type))
-      continue;
-    latency.rel_value_us = ntohl (ats[i].value);
-    GSF_update_peer_latency_ (&address->peer,
-                              latency);
-    GSF_avg_latency.rel_value_us =
-      (GSF_avg_latency.rel_value_us * 31 +
-       GNUNET_MIN (5000, ntohl (ats[i].value))) / 32;
-    GNUNET_STATISTICS_set (GSF_stats,
-                           gettext_noop
-                           ("# running average P2P latency (ms)"),
-                           GSF_avg_latency.rel_value_us / 1000LL, GNUNET_NO);
-    break;
-  }
+  GSF_update_peer_latency_ (&address->peer,
+                            prop->delay);
+  GSF_avg_latency.rel_value_us =
+    (GSF_avg_latency.rel_value_us * 31 +
+     GNUNET_MIN (5000, prop->delay.rel_value_us)) / 32;
+  GNUNET_STATISTICS_set (GSF_stats,
+                         gettext_noop ("# running average P2P latency (ms)"),
+                         GSF_avg_latency.rel_value_us / 1000LL,
+                         GNUNET_NO);
 }
 
 
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index f7d64a49e..749ef15c7 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -348,7 +348,6 @@ GSF_update_peer_latency_ (const struct GNUNET_PeerIdentity *id,
   if (NULL == cp)
     return; /* we're not yet connected at the core level, ignore */
   GNUNET_LOAD_value_set_decline (cp->ppd.transmission_delay, latency);
-  /* LATER: merge atsi into cp's performance data (if we ever care...) */
 }
 
 
@@ -416,9 +415,11 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth)
 
   if (0 != cp->inc_preference)
   {
-    GNUNET_ATS_performance_change_preference (GSF_ats, &target, GNUNET_ATS_PREFERENCE_BANDWIDTH,
-                                  (double) cp->inc_preference,
-                                  GNUNET_ATS_PREFERENCE_END);
+    GNUNET_ATS_performance_change_preference (GSF_ats,
+                                              &target,
+                                              GNUNET_ATS_PREFERENCE_BANDWIDTH,
+                                              (double) cp->inc_preference,
+                                              GNUNET_ATS_PREFERENCE_END);
     cp->inc_preference = 0;
   }
 
diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h
index 502b8652f..eca6ff1ed 100644
--- a/src/fs/gnunet-service-fs_cp.h
+++ b/src/fs/gnunet-service-fs_cp.h
@@ -67,11 +67,6 @@ struct GSF_PeerPerformanceData
 {
 
   /**
-   * Transport performance data.
-   */
-  struct GNUNET_ATS_Information *atsi;
-
-  /**
    * List of the last clients for which this peer successfully
    * answered a query.
    */