clean up for addresses and modification to perf to get values in averaging

1 files changed, 0 insertions, 307 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 8b5413b92..6b8f13a1b 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1355,312 +1355,6 @@ GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle,
 }
 
 
-static int
-eval_count_active_it (void *cls,
-                      const struct GNUNET_PeerIdentity *id,
-                      void *obj)
-{
-  int *request_fulfilled = cls;
-  struct ATS_Address *addr = obj;
-
-  if (GNUNET_YES == addr->active)
-    (*request_fulfilled) = GNUNET_YES;
-
-  if (*request_fulfilled == GNUNET_YES)
-    return GNUNET_NO;
-  else
-    return GNUNET_YES;
-}
-
-
-/**
- * Summary context
- */
-struct SummaryContext
-{
-  /**
-   * Sum of the utilized inbound bandwidth per network
-   */
-  unsigned long long bandwidth_in_assigned[GNUNET_ATS_NetworkTypeCount];
-
-  /**
-   * Sum of the utilized outbound bandwidth per network
-   */
-  unsigned long long bandwidth_out_assigned[GNUNET_ATS_NetworkTypeCount];
-
-  /**
-   * Sum addresses within a network
-   */
-  unsigned int addresses_in_network[GNUNET_ATS_NetworkTypeCount];
-};
-
-
-static int
-eval_sum_bw_used (void *cls, const struct GNUNET_PeerIdentity *id, void *obj)
-{
-  struct SummaryContext *ctx = cls;
-  struct ATS_Address *addr = obj;
-  int networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
-  int net;
-  int c;
-
-  if (GNUNET_YES == addr->active)
-  {
-    net = get_performance_info (addr, GNUNET_ATS_NETWORK_TYPE);
-    for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
-    {
-      if (net == networks[c])
-      {
-        ctx->addresses_in_network[c] ++;
-        ctx->bandwidth_in_assigned[c] += ntohl (addr->assigned_bw_in.value__);
-        ctx->bandwidth_out_assigned[c] += ntohl (addr->assigned_bw_out.value__);
-      }
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Active address in  %s with (in/out) %u/%u Bps\n",
-                GNUNET_ATS_print_network_type (net),
-                (unsigned int) ntohl (addr->assigned_bw_in.value__),
-                (unsigned int) ntohl (addr->assigned_bw_out.value__));
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Summary context
- */
-struct RelativityContext
-{
-
-  struct GAS_Addresses_Handle *ah;
-};
-
-
-static int
-find_active_address (void *cls, const struct GNUNET_PeerIdentity *id, void *obj)
-{
-  struct ATS_Address **res = cls;
-  struct ATS_Address *addr = obj;
-
-  if (GNUNET_YES == addr->active)
-    (*res) = addr;
-
-  if (NULL != (*res))
-    return GNUNET_NO;
-  else
-    return GNUNET_YES;
-}
-
-/**
- * Evaluate current bandwidth assignment
- *
- * @param ah address handle
- */
-void
-GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
-{
-#if 0
-  struct GAS_Addresses_Suggestion_Requests *cur;
-  struct GAS_Addresses_Preference_Clients *pcur;
-  int c;
-
-  float quality_requests_fulfilled = 0.0;
-  float quality_bandwidth_utilization[GNUNET_ATS_NetworkTypeCount];
-  float quality_bandwidth_utilization_total = 0.0;
-  float quality_application_requirements = 0.0;
-  float guq = 0.0;
-
-  int include_requests;
-  int include_utilization;
-  int include_requirements;
-
-  /* Variable related to requests */
-  unsigned int requests_pending;
-  unsigned int requests_fulfilled;
-  unsigned int request_active;
-
-  /* Variable related to utilization */
-  struct SummaryContext sum;
-  struct ATS_Address *active_address;
-  int network_count;
-
-  /* Variables for preferences */
-  int prefs[GNUNET_ATS_PreferenceCount] = GNUNET_ATS_PreferenceType;
-  double pref_val;
-  double prop_val;
-  const double *norm_values;
-  double prefs_fulfill[GNUNET_ATS_PreferenceCount];
-  int prefs_clients[GNUNET_ATS_PreferenceCount];
-  int rels;
-
-  GNUNET_assert (NULL != ah);
-  GNUNET_assert (NULL != ah->addresses);
-
-  requests_pending = 0;
-  requests_fulfilled = 0;
-  /* 1) How many requests could be fulfilled? */
-  for (cur = ah->pending_requests_head; NULL != cur; cur = cur->next)
-  {
-    request_active = GNUNET_NO;
-    GNUNET_CONTAINER_multipeermap_get_multiple (ah->addresses,
-        &cur->id, &eval_count_active_it, &request_active);
-    if (GNUNET_YES == request_active)
-      requests_fulfilled ++;
-    requests_pending ++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': %u pending requests, %s\n",
-        GNUNET_i2s (&cur->id),
-        requests_pending,
-        (GNUNET_YES == request_active) ? "active adress" : "no active address");
-
-  }
-  if (requests_pending > 0)
-  {
-    quality_requests_fulfilled = (float) requests_fulfilled / requests_pending;
-    include_requests = GNUNET_YES;
-  }
-  else
-  {
-    quality_requests_fulfilled = 0.0;
-    include_requests = GNUNET_NO;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u pending requests, %u requests fullfilled\n",
-      requests_pending, requests_fulfilled);
-
-  /* 2) How well is bandwidth utilized? */
-  network_count = 0;
-  for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
-  {
-    quality_bandwidth_utilization[c] = 0.0;
-    sum.addresses_in_network[c] = 0;
-    sum.bandwidth_in_assigned[c] = 0;
-    sum.bandwidth_out_assigned[c] = 0;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate(ah->addresses,
-      &eval_sum_bw_used, &sum);
-  for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
-  {
-    quality_bandwidth_utilization[c] = (((float)sum.bandwidth_out_assigned[c] / ah->env.out_quota[c]) +
-        ((float)sum.bandwidth_in_assigned[c] / ah->env.in_quota[c])) / 2;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Utilization for network `%s': %f\n",
-         GNUNET_ATS_print_network_type(ah->env.networks[c]),
-         quality_bandwidth_utilization[c]);
-    if (sum.addresses_in_network[c] > 0)
-    {
-      quality_bandwidth_utilization_total += quality_bandwidth_utilization[c];
-      network_count ++;
-    }
-  }
-  if (0 < network_count)
-  {
-    quality_bandwidth_utilization_total /= network_count;
-    include_utilization = GNUNET_YES;
-  }
-  else
-  {
-    quality_bandwidth_utilization_total = 0.0;
-    include_utilization = GNUNET_NO;
-  }
-
-  /* 3) How well does selection match application requirements */
-  if (0 == ah->pref_clients)
-  {
-    include_requirements = 0;
-  }
-  else
-  {
-    for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
-    {
-      prefs_fulfill[c] = 0.0;
-      prefs_clients[c] = 0;
-    }
-
-    for (cur = ah->pending_requests_head; NULL != cur; cur = cur->next)
-    {
-      active_address = NULL;
-      GNUNET_CONTAINER_multipeermap_get_multiple (ah->addresses,
-          &cur->id, &find_active_address, &active_address);
-
-      for (pcur = ah->preference_clients_head; NULL != pcur; pcur = pcur->next)
-      {
-        for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
-        {
-          if (prefs[c] == GNUNET_ATS_PREFERENCE_END)
-            continue;
-          pref_val = GAS_normalization_get_preferences_by_client (pcur->client, &cur->id, prefs[c]);
-          if (-1.0 == pref_val)
-          {
-            GNUNET_break (0);
-            continue;
-          }
-
-          if (DEFAULT_REL_PREFERENCE == pref_val)
-          {
-            /* Default preference value */
-            continue;
-          }
-
-          if (NULL != active_address)
-          {
-            norm_values = GAS_normalization_get_properties (active_address);
-            prop_val = norm_values[c];
-            if ((norm_values[c] <= 1.0) || (norm_values[c] >= 2.0))
-                prop_val = DEFAULT_REL_QUALITY;
-          }
-          else
-          {
-            prop_val = DEFAULT_REL_QUALITY;
-          }
-
-          /* We now have preference values [1..2] and properties [1..2] */
-
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u Client %p, Peer %s Property %s: pref: %.3f prop %.3f \n",
-              c,
-              pcur->client,
-              GNUNET_i2s (&cur->id),
-              GNUNET_ATS_print_preference_type(prefs[c]),
-              pref_val,
-              prop_val);
-
-          prefs_fulfill[c] += (pref_val * prop_val) / 2;
-          prefs_clients[c] ++;
-        }
-      }
-    }
-    rels = 0;
-    for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
-    {
-      if (0 < prefs_clients[c])
-      {
-        prefs_fulfill[c] /= prefs_clients[c];
-        rels ++;
-        quality_application_requirements += prefs_fulfill[c];
-      }
-    }
-    if (rels > 0)
-      quality_application_requirements /= rels;
-    else
-      quality_application_requirements = 0.0;
-
-    include_requirements = 1;
-  }
-  /* GUQ */
-
-  if (include_requests + include_utilization + include_requirements > 0)
-    guq = (quality_requests_fulfilled + quality_bandwidth_utilization_total + quality_application_requirements) /
-      (include_requests + include_utilization + include_requirements);
-  else
-    guq = 0.0;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-      "Requests fulfilled %.3f bandwidth utilized %.3f application preferences met %.3f => %.3f\n",
-      quality_requests_fulfilled,
-      quality_bandwidth_utilization_total,
-      quality_application_requirements,
-      guq);
-#endif
-}
-
 /**
  * Solver information callback
  *
@@ -1753,7 +1447,6 @@ solver_info_cb (void *cls,
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
           "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP",
           (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
-      GAS_addresses_evaluate_assignment (cls);
       return;
     default:
       break;