- reduce debug level in proportional

- store pref client in DLL
- remove disconnected clients

6 files changed, 164 insertions, 22 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 154838a00..746dbd7e3 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -249,6 +249,27 @@ struct GAS_Addresses_Suggestion_Requests
   struct GNUNET_PeerIdentity id;
 };
 
+ /**
+  * Pending Address suggestion requests
+  */
+ struct GAS_Addresses_Preference_Clients
+ {
+   /**
+    * Next in DLL
+    */
+   struct GAS_Addresses_Preference_Clients *next;
+
+   /**
+    * Previous in DLL
+    */
+   struct GAS_Addresses_Preference_Clients *prev;
+
+   /**
+    * Peer ID
+    */
+   void *client;
+ };
+
 /**
  * Handle for ATS address component
  */
@@ -290,6 +311,16 @@ struct GAS_Addresses_Handle
   struct GAS_Addresses_Suggestion_Requests *pending_requests_tail;
 
   /**
+   * Address suggestion requests DLL head
+   */
+  struct GAS_Addresses_Preference_Clients *preference_clients_head;
+
+  /**
+   * Address suggestion requests DLL head
+   */
+  struct GAS_Addresses_Preference_Clients *preference_clients_tail;
+
+  /**
    * Solver functions
    */
   struct GNUNET_ATS_PluginEnvironment env;
@@ -636,7 +667,7 @@ find_exact_address (struct GAS_Addresses_Handle *handle,
 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);
 }
 
 /**
@@ -1365,7 +1396,7 @@ struct RelativityContext {
   struct GAS_Addresses_Handle *ah;
 };
 
-
+#if 0
 static int
 eval_preference_relativity (void *cls, const struct GNUNET_PeerIdentity *id, void *obj)
 {
@@ -1390,6 +1421,7 @@ eval_preference_relativity (void *cls, const struct GNUNET_PeerIdentity *id, voi
 
   return GNUNET_OK;
 }
+#endif
 
 
 /**
@@ -1401,6 +1433,7 @@ void
 GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
 {
   struct GAS_Addresses_Suggestion_Requests *cur;
+  struct GAS_Addresses_Preference_Clients *pcur;
   int c;
 
   float quality_requests_fulfilled = 0.0;
@@ -1491,11 +1524,13 @@ GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
   }
 
   /* 3) How well does selection match application requirements */
-  for (cur = ah->pending_requests_head; NULL != cur; cur = cur->next)
+  include_requirements = GNUNET_NO;
+  for (pcur = ah->preference_clients_head; NULL != pcur; pcur = pcur->next)
   {
-    GNUNET_CONTAINER_multipeermap_get_multiple (ah->addresses,
-        &cur->id, &eval_preference_relativity, ah);
-    include_requirements = GNUNET_NO;
+    /* V metrics*/
+    {
+      /* V peers */
+    }
   }
   /* GUQ */
 
@@ -1656,7 +1691,40 @@ normalized_property_changed_cb (void *cls, struct ATS_Address *address,
   ah->env.sf.s_address_update_property (ah->solver, address, type, 0, prop_rel);
 }
 
+static struct GAS_Addresses_Preference_Clients *
+find_preference_client (struct GAS_Addresses_Handle *handle, void *client)
+{
+  struct GAS_Addresses_Preference_Clients *cur;
+
+  for (cur = handle->preference_clients_head; NULL != cur; cur = cur->next)
+  {
+    if (cur->client == client)
+      return cur;
+  }
+  return NULL;
+}
+
+/**
+ * A performance client disconnected
+ *
+ * @param handle address handle
+ * @param client the client
+ */
+
+void
+GAS_addresses_preference_client_disconnect (struct GAS_Addresses_Handle *handle,
+    void *client)
+{
+  struct GAS_Addresses_Preference_Clients * pc;
+  if (NULL != (pc = find_preference_client (handle, client)))
+  {
+    GNUNET_CONTAINER_DLL_remove (handle->preference_clients_head,
+        handle->preference_clients_tail, pc);
+    GNUNET_free (pc);
+  }
 
+  GAS_normalization_preference_client_disconnect (client);
+}
 
 /**
  * Change the preference for a peer
@@ -1668,10 +1736,11 @@ normalized_property_changed_cb (void *cls, struct ATS_Address *address,
  * @param score_abs the new preference score
  */
 void
-GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+GAS_addresses_preference_change (struct GAS_Addresses_Handle *handle,
     void *client, const struct GNUNET_PeerIdentity *peer,
     enum GNUNET_ATS_PreferenceKind kind, float score_abs)
 {
+  struct GAS_Addresses_Preference_Clients * pc;
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
       "Received `%s' for peer `%s' for client %p\n", "CHANGE PREFERENCE",
       GNUNET_i2s (peer), client);
@@ -1689,6 +1758,14 @@ GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
     return;
   }
 
+  if (NULL == find_preference_client (handle, client))
+  {
+    pc = GNUNET_malloc (sizeof (struct GAS_Addresses_Preference_Clients));
+    pc->client = client;
+    GNUNET_CONTAINER_DLL_insert (handle->preference_clients_head,
+        handle->preference_clients_tail, pc);
+  }
+
   handle->env.sf.s_bulk_start (handle->solver);
   /* Tell normalization about change, normalization will call callback if preference changed */
   GAS_normalization_normalize_preference (client, peer, kind, score_abs);
@@ -2110,6 +2187,7 @@ void
 GAS_addresses_done (struct GAS_Addresses_Handle *handle)
 {
   struct GAS_Addresses_Suggestion_Requests *cur;
+  struct GAS_Addresses_Preference_Clients *pcur;
 
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Shutting down addresses\n");
   GNUNET_assert(NULL != handle);
@@ -2123,6 +2201,13 @@ GAS_addresses_done (struct GAS_Addresses_Handle *handle)
     GNUNET_free(cur);
   }
 
+  while (NULL != (pcur = handle->preference_clients_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (handle->preference_clients_head,
+        handle->preference_clients_tail, pcur);
+    GNUNET_free (pcur);
+  }
+
   GNUNET_PLUGIN_unload (handle->plugin, handle->solver);
   GNUNET_free (handle->plugin);
   GNUNET_free(handle);
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index 2f1c58705..887eeee81 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -523,6 +523,18 @@ void
 GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle,
     const struct GNUNET_PeerIdentity *peer);
 
+
+/**
+ * A performance client disconnected
+ *
+ * @param handle address handle
+ * @param client the client
+ */
+
+void
+GAS_addresses_preference_client_disconnect (struct GAS_Addresses_Handle *handle,
+    void *client);
+
 /**
  * Change the preference for a peer
  *
@@ -533,7 +545,7 @@ GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle,
  * @param score_abs the new preference score
  */
 void
-GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+GAS_addresses_preference_change (struct GAS_Addresses_Handle *handle,
     void *client, const struct GNUNET_PeerIdentity *peer,
     enum GNUNET_ATS_PreferenceKind kind, float score_abs);
 
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index 954f2b5f5..96936332a 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -404,6 +404,7 @@ preference_aging (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 }
 
+
 /**
  * Normalize an updated preference value
  *
@@ -502,7 +503,7 @@ GAS_normalization_normalize_preference (void *src,
  * default preferences if peer does not exist
  */
 const double *
-GAS_normalization_get_preferences (const struct GNUNET_PeerIdentity *id)
+GAS_normalization_get_preferences_by_peer (const struct GNUNET_PeerIdentity *id)
 {
   GNUNET_assert(NULL != preference_peers);
   GNUNET_assert(NULL != id);
@@ -809,6 +810,48 @@ GAS_normalization_normalize_property (struct GNUNET_CONTAINER_MultiPeerMap *addr
   }
 }
 
+
+static void
+free_client (struct PreferenceClient *pc)
+{
+  struct PreferencePeer *next_p;
+  struct PreferencePeer *p;
+  next_p = pc->p_head;
+  while (NULL != (p = next_p))
+  {
+    next_p = p->next;
+    GNUNET_CONTAINER_DLL_remove(pc->p_head, pc->p_tail, p);
+    GNUNET_free(p);
+  }
+  GNUNET_free(pc);
+}
+
+
+/**
+ * A performance client disconnected
+ *
+ * @param client the client
+ */
+
+void
+GAS_normalization_preference_client_disconnect (void *client)
+{
+  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;
+
+  GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, c_cur);
+  free_client (c_cur);
+}
+
+
 /**
  * Start the normalization component
  *
@@ -893,14 +936,7 @@ GAS_normalization_stop ()
   {
     next_pc = pc->next;
     GNUNET_CONTAINER_DLL_remove(pc_head, pc_tail, pc);
-    next_p = pc->p_head;
-    while (NULL != (p = next_p))
-    {
-      next_p = p->next;
-      GNUNET_CONTAINER_DLL_remove(pc->p_head, pc->p_tail, p);
-      GNUNET_free(p);
-    }
-    GNUNET_free(pc);
+    free_client (pc);
   }
 
   GNUNET_CONTAINER_multipeermap_iterate (preference_peers, &free_peer, NULL );
diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h
index 1f0d081d4..43b07910f 100644
--- a/src/ats/gnunet-service-ats_normalization.h
+++ b/src/ats/gnunet-service-ats_normalization.h
@@ -55,7 +55,7 @@ typedef void
  * with GNUNET_ATS_PreferenceKind, NULL if peer does not exist
  */
 const double *
-GAS_normalization_get_preferences (const struct GNUNET_PeerIdentity *id);
+GAS_normalization_get_preferences_by_peer (const struct GNUNET_PeerIdentity *id);
 
 
 /**
@@ -99,6 +99,14 @@ GAS_normalization_normalize_property (struct GNUNET_CONTAINER_MultiPeerMap *addr
 
 
 /**
+ * A performance client disconnected
+ *
+ * @param client the disconnecting client
+ */
+void
+GAS_normalization_preference_client_disconnect (void *client);
+
+/**
  * Start the normalization component
  *
  * @param pref_ch_cb callback to call on relative preference changing
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index d94b0a7e6..8aad96eea 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -129,6 +129,7 @@ GAS_performance_remove_client (struct GNUNET_SERVER_Client *client)
   if (NULL == pc)
     return;
   GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, pc);
+  GAS_addresses_preference_client_disconnect (GSA_addresses, client);
   GNUNET_free (pc);
 }
 
@@ -639,7 +640,7 @@ GAS_handle_preference_change (void *cls,
                             1, GNUNET_NO);
   pi = (const struct PreferenceInformation *) &msg[1];
   for (i = 0; i < nump; i++)
-    GAS_addresses_change_preference (GSA_addresses,
+    GAS_addresses_preference_change (GSA_addresses,
                                      client,
                                      &msg->peer,
                                      (enum GNUNET_ATS_PreferenceKind)
diff --git a/src/ats/libgnunet_plugin_ats_proportional.c b/src/ats/libgnunet_plugin_ats_proportional.c
index 39524a17d..6118329b6 100644
--- a/src/ats/libgnunet_plugin_ats_proportional.c
+++ b/src/ats/libgnunet_plugin_ats_proportional.c
@@ -479,7 +479,7 @@ libgnunet_plugin_ats_proportional_done (void *cls)
 
     if (s->network_entries[c].active_addresses > 0)
     {
-      LOG(GNUNET_ERROR_TYPE_ERROR,
+      LOG(GNUNET_ERROR_TYPE_DEBUG,
           "Had %u active addresses for network `%s' not deleted during shutdown\n",
           s->network_entries[c].active_addresses, s->network_entries[c].desc);
       GNUNET_break(0);
@@ -499,13 +499,13 @@ libgnunet_plugin_ats_proportional_done (void *cls)
   }
   if (s->total_addresses > 0)
   {
-    LOG(GNUNET_ERROR_TYPE_ERROR,
+    LOG(GNUNET_ERROR_TYPE_DEBUG,
         "Had %u addresses not deleted during shutdown\n", s->total_addresses);
     GNUNET_break(0);
   }
   if (s->active_addresses > 0)
   {
-    LOG(GNUNET_ERROR_TYPE_ERROR,
+    LOG(GNUNET_ERROR_TYPE_DEBUG,
         "Had %u active addresses not deleted during shutdown\n",
         s->active_addresses);
     GNUNET_break (0);