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

[gnunet]

Author: wachs
Date: 2012-12-11 14:22:40 +0100 (Tue, 11 Dec 2012)
New Revision: 25391

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
Log:
- deletion


Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-11 12:27:41 UTC 
(rev 25390)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-11 13:22:40 UTC 
(rev 25391)
@@ -36,7 +36,32 @@
 #endif
 #include "gnunet-service-ats_addresses_simplistic.h"
 
+/**
+ * ATS address management
+ *
+ * Adding addresses:
+ *
+ * - If you add a new address without a session, a new address will be added
+ * - If you add this address again now with a session a, the existing address
+ *   will be updated with this session
+ * - If you add this address again now with a session b, a new address object
+ *   with this session will be added
 
+ * Destroying addresses:
+ *
+ * - If you destroy an address without a session, the address itself and all
+ *   address instances with an session will be removed
+ * - If you destroy an address with a session, the session for this address
+ *   will be removed
+ *
+ * Conclusion
+ * Addresses without a session will be updated with a new session and if the
+ * the session is destroyed the session is removed and address itself still
+ * exists for suggestion
+ *
+ */
+
+
 /**
  * Available ressource assignment modes
  */
@@ -393,7 +418,7 @@
  * @return existing address record, NULL for none
  */
 struct ATS_Address *
-find_address (const struct GNUNET_PeerIdentity *peer,
+find_equivalent_address (const struct GNUNET_PeerIdentity *peer,
               const struct ATS_Address *addr)
 {
   struct CompareAddressContext cac;
@@ -412,13 +437,15 @@
 
 static struct ATS_Address *
 lookup_address (const struct GNUNET_PeerIdentity *peer,
-                const char *plugin_name, const void *plugin_addr,
-                size_t plugin_addr_len, uint32_t session_id,
+                const char *plugin_name,
+                const void *plugin_addr,
+                size_t plugin_addr_len,
+                uint32_t session_id,
                 const struct GNUNET_ATS_Information *atsi,
                 uint32_t atsi_count)
 {
   struct ATS_Address *aa;
-  struct ATS_Address *old;
+  struct ATS_Address *ea;
 
   aa = create_address (peer,
                        plugin_name,
@@ -426,17 +453,17 @@
                        session_id);
 
   /* Get existing address or address with session == 0 */
-  old = find_address (peer, aa);
+  ea = find_equivalent_address (peer, aa);
   free_address (aa);
-  if (old == NULL)
+  if (ea == NULL)
   {
     return NULL;
   }
-  else if (old->session_id != session_id)
+  else if (ea->session_id != session_id)
   {
     return NULL;
   }
-  return old;
+  return ea;
 }
 
 
@@ -448,7 +475,7 @@
                       uint32_t atsi_count)
 {
   struct ATS_Address *aa;
-  struct ATS_Address *old;
+  struct ATS_Address *ea;
   unsigned int ats_res;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -461,9 +488,7 @@
 
   GNUNET_assert (NULL != handle->addresses);
 
-  aa = create_address (peer,
-                       plugin_name,
-                       plugin_addr, plugin_addr_len,
+  aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len,
                        session_id);
   if (atsi_count != (ats_res = disassemble_ats_information(atsi, atsi_count, 
aa)))
   {
@@ -473,8 +498,8 @@
   }
 
   /* Get existing address or address with session == 0 */
-  old = find_address (peer, aa);
-  if (old == NULL)
+  ea = find_equivalent_address (peer, aa);
+  if (ea == NULL)
   {
     /* We have a new address */
     GNUNET_assert (GNUNET_OK ==
@@ -490,9 +515,9 @@
   GNUNET_free (aa->plugin);
   GNUNET_free (aa);
 
-  if (old->session_id != 0)
+  if (ea->session_id != 0)
   {
-      /* This address and session is already existing */
+      /* This addresswith the same session is already existing */
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Added already existing address for peer `%s' `%s' %p with new 
session %u\n",
                 GNUNET_i2s (peer), plugin_name, session_id);
@@ -503,16 +528,16 @@
   /* We have an address without an session, update this address */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
             "Updated existing address for peer `%s' %p with new session %u\n",
-            GNUNET_i2s (peer), old, session_id);
-  old->session_id = session_id;
-  if (atsi_count != (ats_res = disassemble_ats_information(atsi, atsi_count, 
old)))
+            GNUNET_i2s (peer), ea, session_id);
+  ea->session_id = session_id;
+  if (atsi_count != (ats_res = disassemble_ats_information(atsi, atsi_count, 
ea)))
   {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "While updating address: had %u ATS elements to add, could 
only add %u\n",
                 atsi_count, ats_res);
   }
 
-  handle->s_update (handle->solver, handle->addresses, old);
+  handle->s_update (handle->solver, handle->addresses, ea);
 }
 
 
@@ -562,6 +587,20 @@
 }
 
 
+struct DestroyContext
+{
+  struct ATS_Address *aa;
+
+  struct GAS_Addresses_Handle *handle;
+
+  /**
+   * GNUNET_NO  : full address
+   * GNUNET_YES : just session
+   */
+  int result;
+};
+
+
 /**
  * Delete an address
  *
@@ -577,84 +616,99 @@
 static int
 destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void 
*value)
 {
-  const struct ATS_Address *info = cls;
+  struct DestroyContext *dc = cls;
+  struct GAS_Addresses_Handle *handle = dc->handle;
+  const struct ATS_Address *des = dc->aa;
   struct ATS_Address *aa = value;
 
-  GNUNET_assert (0 ==
-                 memcmp (&aa->peer, &info->peer,
-                         sizeof (struct GNUNET_PeerIdentity)));
-  /* session == 0, remove full address  */
-  if ((info->session_id == 0) && (0 == strcmp (info->plugin, aa->plugin)) &&
-      (aa->addr_len == info->addr_len) &&
-      (0 == memcmp (info->addr, aa->addr, aa->addr_len)))
+  GNUNET_assert (0 == memcmp (&aa->peer, &des->peer,
+                              sizeof (struct GNUNET_PeerIdentity)));
+
+
+  if (des->session_id == 0)
   {
+    /* Session == 0, remove full address  */
+    if ((0 == strcmp (des->plugin, aa->plugin)) &&
+        (aa->addr_len == des->addr_len) &&
+        (0 == memcmp (des->addr, aa->addr, aa->addr_len)))
+    {
 
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Deleting address for peer `%s': `%s' %u\n",
-                GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Deleting full address for peer `%s' session %u %p\n",
+                  GNUNET_i2s (&aa->peer), aa->session_id, aa);
 
-    destroy_address (aa);
-      // FIXME if (GNUNET_YES == destroy_address (aa))recalculate_assigned_bw 
();
-    return GNUNET_OK;
+      /* Notify solver about deletion */
+      handle->s_del (handle->solver, handle->addresses, aa);
+      destroy_address (aa);
+      dc->result = GNUNET_NO;
+      return GNUNET_OK; /* Continue iteration */
+    }
   }
-  /* session != 0, just remove session */
-  if (aa->session_id != info->session_id)
-    return GNUNET_OK;           /* irrelevant */
-  if (aa->session_id != 0)
-    GNUNET_break (0 == strcmp (info->plugin, aa->plugin));
-  /* session died */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Deleting session for peer `%s': `%s' %u\n",
-              GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
-  aa->session_id = 0;
-
-  if (GNUNET_YES == aa->active)
+  else
   {
-    aa->active = GNUNET_NO;
-    //FIXME recalculate_assigned_bw ();
-  }
+    /* Session != 0, just remove session */
+    if (aa->session_id != des->session_id)
+      return GNUNET_OK; /* irrelevant */
 
-  /* session == 0 and addrlen == 0 : destroy address */
-  if (aa->addr_len == 0)
-  {
+    if (aa->session_id != 0)
+      GNUNET_break (0 == strcmp (des->plugin, aa->plugin));
+
+    /* Session died */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Deleting session and address for peer `%s': `%s' %u\n",
+                "Deleting session for peer `%s': `%s' %u\n",
                 GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
-    (void) destroy_address (aa);
+    aa->session_id = 0;
   }
-  else
-  {
-    /* session was set to 0, update address */
-#if HAVE_LIBGLPK
-  if (handle->ats_mode == MODE_MLP)
-    GAS_mlp_address_update (handle->solver, handle->addresses, aa);
+
+#if 0
+/* Old code */
+    /*
+    if (GNUNET_YES == aa->active)
+      aa->active = GNUNET_NO;
+  */
+    /* session == 0 and addrlen == 0 : destroy address */
+    if (aa->addr_len == 0)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Deleting session and address for peer `%s': `%s' %u\n",
+                  GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+      (void) destroy_address (aa);
+    }
+    else
+    {
+      /* session was set to 0, update address */
+  #if HAVE_LIBGLPK
+    if (handle->ats_mode == MODE_MLP)
+      GAS_mlp_address_update (handle->solver, handle->addresses, aa);
+  #endif
+    }
+
+  }
 #endif
-  }
-
   return GNUNET_OK;
 }
 
-
 void
 GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
                        const char *plugin_name, const void *plugin_addr,
                        size_t plugin_addr_len, uint32_t session_id)
 {
-  struct ATS_Address *aa;
-  struct ATS_Address *old;
+  struct ATS_Address *ea;
+  struct DestroyContext dc;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' for peer `%s'\n",
-              "ADDRESS DESTROY",
-              GNUNET_i2s (peer));
-
   if (GNUNET_NO == handle->running)
     return;
 
   /* Get existing address */
-  old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
+  ea = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
                        session_id, NULL, 0);
-  if (old == NULL)
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received `%s' for peer `%s' address %p session %u\n",
+              "ADDRESS DESTROY",
+              GNUNET_i2s (peer), ea, session_id);
+
+  if (ea == NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tried to destroy unknown address 
for peer `%s' `%s' session id %u\n",
                 GNUNET_i2s (peer), plugin_name, session_id);
@@ -662,10 +716,12 @@
   }
 
   GNUNET_break (0 < strlen (plugin_name));
-  aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, 
session_id);
+  dc.handle = handle;
+  dc.aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, 
session_id);
+
   GNUNET_CONTAINER_multihashmap_get_multiple (handle->addresses, 
&peer->hashPubKey,
-                                              &destroy_by_session_id, aa);
-  free_address (aa);
+                                              &destroy_by_session_id, &dc);
+  free_address (dc.aa);
 }
 
 

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-11 
12:27:41 UTC (rev 25390)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-11 
13:22:40 UTC (rev 25391)
@@ -327,27 +327,27 @@
 void
 GAS_simplistic_address_delete (void *solver, struct 
GNUNET_CONTAINER_MultiHashMap * addresses, struct ATS_Address *address)
 {
-#if 0
   struct GAS_SIMPLISTIC_Handle *s = solver;
-  GNUNET_assert (NULL != s);
-  int c;
-  for (c = 0; c < s->networks; c++)
+  struct Network *net;
+  /* Remove an adress completely, we have to:
+   * - Remove from specific network
+   * - Decrease number of total addresses */
+  net = (struct Network *) address->solver_information;
+
+  GNUNET_break (0 < net->total_addresses);
+
+
+
+  if (GNUNET_YES == address->active)
   {
-      if (address->atsp_network_type == s->quota_net[c])
-      {
-          GNUNET_assert (s->active_addresses_per_net[c] > 0);
-          s->active_addresses_per_net[c] --;
-          LOG (GNUNET_ERROR_TYPE_DEBUG,
-                      "Deleting address for network type %u (now %u total)\n",
-                      address->atsp_network_type,
-                      s->active_addresses_per_net[c]);
-          break;
-      }
+      /* Address was active, remove from network and update quotas*/
+      address->active = GNUNET_NO;
+      if (net->active_addresses < 1)
+        GNUNET_break (0);
+      net->active_addresses --;
+      update_quota_per_network (s, net, NULL);
   }
 
-  /* Update quota for this network type */
-  update_quota_per_network (s, c);
-#endif
 }
 
 
@@ -430,14 +430,37 @@
   return GNUNET_OK;
 }
 
+static int
+find_active_address_it (void *cls, const struct GNUNET_HashCode * key, void 
*value)
+{
+  struct ATS_Address * dest = (struct ATS_Address *) (*(struct ATS_Address 
**)cls);
+  struct ATS_Address * aa = (struct ATS_Address *) value;
+
+  if (GNUNET_YES == aa->active)
+  {
+      if (dest != NULL)
+      {
+          /* should never happen */
+          LOG (GNUNET_ERROR_TYPE_ERROR, "Multiple active addresses for peer 
`%s'\n", GNUNET_i2s (&aa->peer));
+          GNUNET_break (0);
+          return GNUNET_NO;
+      }
+      dest = aa;
+  }
+  return GNUNET_OK;
+}
+
 static struct ATS_Address *
 find_active_address (void *solver,
                      struct GNUNET_CONTAINER_MultiHashMap * addresses,
                      const struct GNUNET_PeerIdentity *peer)
 {
-  struct ATS_Address * aa = NULL;
+  struct ATS_Address * dest = NULL;
 
-  return aa;
+  GNUNET_CONTAINER_multihashmap_get_multiple(addresses,
+       &peer->hashPubKey,
+       &find_active_address_it, &dest);
+  return dest;
 }
 
 /**