get normalized pref per client

4 files changed, 64 insertions, 6 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 7d0eb48ea..833a26c41 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1460,6 +1460,10 @@ GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
   struct SummaryContext sum;
   int network_count;
 
+  /* Variables for preferences */
+  int prefs[GNUNET_ATS_PreferenceCount] = GNUNET_ATS_PreferenceType;
+  double pref_val;
+
   GNUNET_assert (NULL != ah);
   GNUNET_assert (NULL != ah->addresses);
 
@@ -1530,12 +1534,32 @@ GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
 
   /* 3) How well does selection match application requirements */
   include_requirements = GNUNET_NO;
-  for (pcur = ah->preference_clients_head; NULL != pcur; pcur = pcur->next)
+  if (0 == ah->pref_clients)
   {
-    /* V metrics*/
+    include_requirements = GNUNET_NO;
+  }
+  else
+  {
+    for (pcur = ah->preference_clients_head; NULL != pcur; pcur = pcur->next)
     {
-      /* V peers */
+      /* V metrics*/
+      for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
+      {
+
+        if (prefs[c] == GNUNET_ATS_PREFERENCE_END)
+          continue;
+        pref_val = -1.0;
+        pref_val = GAS_normalization_get_preferences_by_client (pcur->client, prefs[c]);
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "normalized pref for client %p == %.3f\n",
+            pcur->client, pref_val);
+        if (-1.0 == pref_val)
+        {
+          GNUNET_break (0);
+          continue;
+        }
+      }
     }
+    include_requirements = GNUNET_YES;
   }
   /* GUQ */
 
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index 96936332a..9a4e72665 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -519,6 +519,30 @@ GAS_normalization_get_preferences_by_peer (const struct GNUNET_PeerIdentity *id)
 }
 
 /**
+ * Get the normalized preference values for a specific peer or
+ * the default values if
+ *
+ * @param id the peer
+ * @return pointer to the values, can be indexed with GNUNET_ATS_PreferenceKind,
+ * default preferences if peer does not exist
+ */
+const double
+GAS_normalization_get_preferences_by_client (const void *client, enum GNUNET_ATS_PreferenceKind pref)
+{
+  struct PreferenceClient *c_cur;
+  /* Find preference client */
+  for (c_cur = pc_head; NULL != c_cur; c_cur = c_cur->next)
+  {
+    if (client == c_cur->client)
+      break;
+  }
+  if (NULL == c_cur)
+    return -1;
+
+  return 1.0;
+}
+
+/**
  * Get the normalized properties values for a specific peer or
  * the default values if
  *
@@ -922,8 +946,6 @@ GAS_normalization_stop ()
 {
   struct PreferenceClient *pc;
   struct PreferenceClient *next_pc;
-  struct PreferencePeer *p;
-  struct PreferencePeer *next_p;
 
   if (GNUNET_SCHEDULER_NO_TASK != aging_task)
   {
diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h
index 43b07910f..e1f5a5345 100644
--- a/src/ats/gnunet-service-ats_normalization.h
+++ b/src/ats/gnunet-service-ats_normalization.h
@@ -69,6 +69,18 @@ GAS_normalization_get_preferences_by_peer (const struct GNUNET_PeerIdentity *id)
 const double *
 GAS_normalization_get_properties (struct ATS_Address *address);
 
+
+/**
+ * Get the normalized preference values for a specific client
+ *
+ * @param client the client
+ * @param pref desired pref value
+ * @return normalized value
+ */
+const double
+GAS_normalization_get_preferences_by_client (const void *client,
+    enum GNUNET_ATS_PreferenceKind pref);
+
 /**
  * Normalize an updated preference value
  *
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index d4723534d..7767e5496 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -313,7 +313,7 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 const double *
 get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
 {
-  return GAS_normalization_get_preferences (id);
+  return GAS_normalization_get_preferences_by_peer (id);
 }