changes

3 files changed, 426 insertions, 84 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 0506d3e75..f9a1ec425 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -72,6 +72,7 @@ check_PROGRAMS = \
  test_ats_simplistic \
  test_ats_simplistic_switch_networks \
  test_ats_simplistic_change_preference \
+ test_ats_simplistic_pref_aging \
  test_ats_api_performance
 # $(GN_MLP_TEST) \
 # $(GN_MLP_TEST_AVG) \
@@ -186,6 +187,12 @@ test_ats_simplistic_change_preference_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la
 
+test_ats_simplistic_pref_aging_SOURCES = \
+ test_ats_simplistic_pref_aging.c test_ats_api_common.c
+test_ats_simplistic_pref_aging_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/ats/libgnunetats.la  
 
 if HAVE_LIBGLPK
 #test_ats_mlp_SOURCES = \
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c
index cf547bc70..b5df2a1f6 100644
--- a/src/ats/gnunet-service-ats_addresses_simplistic.c
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.c
@@ -55,6 +55,9 @@
  *
  */
 
+#define PREF_AGING_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define PREF_AGING_FACTOR 0.95
+
 #define DEFAULT_PREFERENCE 1.0
 #define MIN_UPDATE_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
@@ -171,6 +174,8 @@ struct PreferencePeer
   double f[GNUNET_ATS_PreferenceCount];
   double f_rel[GNUNET_ATS_PreferenceCount];
   double f_rel_total;
+
+  GNUNET_SCHEDULER_TaskIdentifier aging_task;
 };
 
 struct PreferenceClient
@@ -347,6 +352,11 @@ GAS_simplistic_done (void *solver)
       while (NULL != (p = next_p))
       {
           next_p = p->next;
+          if (GNUNET_SCHEDULER_NO_TASK != p->aging_task)
+          {
+                GNUNET_SCHEDULER_cancel(p->aging_task);
+                p->aging_task = GNUNET_SCHEDULER_NO_TASK;
+          }
           GNUNET_CONTAINER_DLL_remove (pc->p_head, pc->p_tail, p);
           GNUNET_free (p);
       }
@@ -1065,6 +1075,116 @@ GAS_simplistic_get_preferred_address (void *solver,
   return cur;
 }
 
+static void
+update_preference (struct GAS_SIMPLISTIC_Handle *s,
+                                                                         struct PreferenceClient *cur,
+                                                                         struct PreferencePeer *p,
+                                                                         enum GNUNET_ATS_PreferenceKind kind,
+                                                         float score_f)
+{
+  double p_rel_global;
+  double *dest;
+  double score = score_f;
+  struct PreferencePeer *p_cur;
+  int i;
+  int clients;
+
+  /* Update preference value according to type */
+  switch (kind) {
+    case GNUNET_ATS_PREFERENCE_BANDWIDTH:
+    case GNUNET_ATS_PREFERENCE_LATENCY:
+      p->f[kind] = (p->f[kind] + score) / 2;
+      break;
+    case GNUNET_ATS_PREFERENCE_END:
+      break;
+    default:
+      break;
+  }
+
+  /* Recalcalculate total preference for this quality kind over all peers*/
+  cur->f_total[kind] = 0;
+  for (p_cur = cur->p_head; NULL != p_cur; p_cur = p_cur->next)
+    cur->f_total[kind] += p_cur->f[kind];
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p has total preference for %s of %.3f\n",
+      cur->client,
+      GNUNET_ATS_print_preference_type (kind),
+      cur->f_total[kind]);
+
+  /* Recalcalculate relative preference for all peers */
+  for (p_cur = cur->p_head; NULL != p_cur; p_cur = p_cur->next)
+  {
+    /* Calculate relative preference for specific kind */
+    p_cur->f_rel[kind] = (cur->f_total[kind] + p_cur->f[kind]) / cur->f_total[kind];
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p: peer `%s' has relative preference for %s of %.3f\n",
+        cur->client,
+        GNUNET_i2s (&p_cur->id),
+        GNUNET_ATS_print_preference_type (kind),
+        p_cur->f_rel[kind]);
+
+    /* Calculate peer relative preference
+     * Start with i = 1 to exclude terminator */
+    p_cur->f_rel_total = 0;
+    for (i = 1; i < GNUNET_ATS_PreferenceCount; i ++)
+    {
+        p_cur->f_rel_total += p_cur->f_rel[i];
+    }
+    p_cur->f_rel_total /=  (GNUNET_ATS_PreferenceCount - 1.0); /* -1 due to terminator */
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p: peer `%s' has total relative preference of %.3f\n",
+        cur->client,
+        GNUNET_i2s (&p_cur->id),
+        p_cur->f_rel_total);
+  }
+
+  /* Calculcate global total relative peer preference over all clients */
+  p_rel_global = 0.0;
+  clients = 0;
+  for (cur = s->pc_head; NULL != cur; cur = cur->next)
+  {
+      for (p_cur = cur->p_head; NULL != p_cur; p_cur = p_cur->next)
+          if (0 == memcmp (&p_cur->id, &p->id, sizeof (p_cur->id)))
+              break;
+      if (NULL != p_cur)
+      {
+          clients++;
+          p_rel_global += p_cur->f_rel_total;
+      }
+  }
+  p_rel_global /= clients;
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Global preference value for peer `%s': %.3f\n",
+      GNUNET_i2s (&p->id), p_rel_global);
+
+  /* Update global map */
+  /* FIXME: We should update all peers since they have influence on each other */
+  if (NULL != (dest = GNUNET_CONTAINER_multihashmap_get(s->prefs, &p->id.hashPubKey)))
+      (*dest) = p_rel_global;
+  else
+  {
+      dest = GNUNET_malloc (sizeof (float));
+      (*dest) = p_rel_global;
+      GNUNET_CONTAINER_multihashmap_put(s->prefs,
+          &p->id.hashPubKey,
+          dest,
+          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+  }
+}
+
+
+static void
+preference_aging (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+        struct PreferencePeer *p = cls;
+        GNUNET_assert (NULL != p);
+        p->aging_task = GNUNET_SCHEDULER_NO_TASK;
+
+/*  LOG (GNUNET_ERROR_TYPE_ERROR, "Aging preferences for peer `%s'\n",
+                GNUNET_i2s (&p->id));*/
+
+  p->aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL,
+                &preference_aging, p);
+}
+
+
 /**
  * Changes the preferences for a peer in the problem
  *
@@ -1086,10 +1206,6 @@ GAS_simplistic_address_change_preference (void *solver,
   struct PreferenceClient *cur;
   struct PreferencePeer *p;
   int i;
-  int clients;
-  double p_rel_global;
-  double *dest;
-  double score = score_f;
 
   GNUNET_assert (NULL != solver);
   GNUNET_assert (NULL != client);
@@ -1099,7 +1215,7 @@ GAS_simplistic_address_change_preference (void *solver,
                                 client,
                                 GNUNET_i2s (peer),
                                 GNUNET_ATS_print_preference_type (kind),
-                                score);
+                                score_f);
 
   if (kind >= GNUNET_ATS_PreferenceCount)
   {
@@ -1168,87 +1284,11 @@ GAS_simplistic_address_change_preference (void *solver,
         /* Default value per peer relative preference for a quality: 1.0 */
         p->f_rel[i] = DEFAULT_PREFERENCE;
       }
+      p->aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL, &preference_aging, p);
       GNUNET_CONTAINER_DLL_insert (cur->p_head, cur->p_tail, p);
   }
 
-  /* Update preference value according to type */
-  switch (kind) {
-    case GNUNET_ATS_PREFERENCE_BANDWIDTH:
-    case GNUNET_ATS_PREFERENCE_LATENCY:
-      p->f[kind] = (p->f[kind] + score) / 2;
-      break;
-    case GNUNET_ATS_PREFERENCE_END:
-      break;
-    default:
-      break;
-  }
-
-  /* Recalcalculate total preference for this quality kind over all peers*/
-  cur->f_total[kind] = 0;
-  for (p = cur->p_head; NULL != p; p = p->next)
-    cur->f_total[kind] += p->f[kind];
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p has total preference for %s of %.3f\n",
-      cur->client,
-      GNUNET_ATS_print_preference_type (kind),
-      cur->f_total[kind]);
-
-  /* Recalcalculate relative preference for all peers */
-  for (p = cur->p_head; NULL != p; p = p->next)
-  {
-    /* Calculate relative preference for specific kind */
-    p->f_rel[kind] = (cur->f_total[kind] + p->f[kind]) / cur->f_total[kind];
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p: peer `%s' has relative preference for %s of %.3f\n",
-        cur->client,
-        GNUNET_i2s (&p->id),
-        GNUNET_ATS_print_preference_type (kind),
-        p->f_rel[kind]);
-
-    /* Calculate peer relative preference
-     * Start with i = 1 to exclude terminator */
-    p->f_rel_total = 0;
-    for (i = 1; i < GNUNET_ATS_PreferenceCount; i ++)
-    {
-        p->f_rel_total += p->f_rel[i];
-    }
-    p->f_rel_total /=  (GNUNET_ATS_PreferenceCount - 1.0); /* -1 due to terminator */
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p: peer `%s' has total relative preference of %.3f\n",
-        cur->client,
-        GNUNET_i2s (&p->id),
-        p->f_rel_total);
-  }
-
-  /* Calculcate global total relative peer preference over all clients */
-  p_rel_global = 0.0;
-  clients = 0;
-  for (cur = s->pc_head; NULL != cur; cur = cur->next)
-  {
-      for (p = cur->p_head; NULL != p; p = p->next)
-          if (0 == memcmp (&p->id, peer, sizeof (p->id)))
-              break;
-      if (NULL != p)
-      {
-          clients++;
-          p_rel_global += p->f_rel_total;
-      }
-  }
-  p_rel_global /= clients;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Global preference value for peer `%s': %.3f\n",
-      GNUNET_i2s (peer), p_rel_global);
-
-  /* Update global map */
-  /* FIXME: We should update all peers since they have influence on each other */
-  if (NULL != (dest = GNUNET_CONTAINER_multihashmap_get(s->prefs, &peer->hashPubKey)))
-      (*dest) = p_rel_global;
-  else
-  {
-      dest = GNUNET_malloc (sizeof (float));
-      (*dest) = p_rel_global;
-      GNUNET_CONTAINER_multihashmap_put(s->prefs,
-          &peer->hashPubKey,
-          dest,
-          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-  }
+  update_preference (s, cur, p, kind, score_f);
 
   /* FIXME: We should update quotas if UPDATE_INTERVAL is reached */
   if (GNUNET_TIME_absolute_get().abs_value > next_update.abs_value)
@@ -1257,7 +1297,6 @@ GAS_simplistic_address_change_preference (void *solver,
       next_update = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(),
                                               MIN_UPDATE_INTERVAL);
   }
-
 }
 
 /* end of gnunet-service-ats_addresses_simplistic.c */
diff --git a/src/ats/test_ats_simplistic_pref_aging.c b/src/ats/test_ats_simplistic_pref_aging.c
new file mode 100644
index 000000000..0bd618189
--- /dev/null
+++ b/src/ats/test_ats_simplistic_pref_aging.c
@@ -0,0 +1,296 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file ats/test_ats_mlp.c
+ * @brief test for the MLP solver
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+
+ */
+/**
+ * @file ats/test_ats_api_scheduling_add_address.c
+ * @brief test for ats simplistic solver preference aging:
+ *      Add 2 addresses and set high preference for one. Expect higher bw for this
+ *      address, wait. Preferences should age and so bw assigned should decrease.
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_ats_service.h"
+#include "gnunet_testing_lib.h"
+#include "ats.h"
+#include "test_ats_api_common.h"
+
+#define DEBUG_ATS_INFO GNUNET_NO
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+/**
+ * Scheduling handle
+ */
+static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+
+/**
+ * Performance handle
+ */
+static struct GNUNET_ATS_PerformanceHandle *perf_ats;
+
+/**
+ * Return value
+ */
+static int ret;
+
+/**
+ * Test address
+ */
+static struct Test_Address test_addr[2];
+
+/**
+ * Test peer
+ */
+static struct PeerContext p[2];
+
+
+/**
+ * HELLO address
+ */
+struct GNUNET_HELLO_Address test_hello_address[2];
+
+/**
+ * Session
+ */
+static void *test_session[2];
+
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
+
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
+
+/**
+ * Configured WAN out quota
+ */
+unsigned long long wan_quota_out;
+
+/**
+ * Configured WAN in quota
+ */
+unsigned long long wan_quota_in;
+
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+
+  if (sched_ats != NULL)
+    GNUNET_ATS_scheduling_done (sched_ats);
+  if (perf_ats != NULL)
+    GNUNET_ATS_performance_done (perf_ats);
+  free_test_address (&test_addr[0]);
+  ret = GNUNET_SYSERR;
+}
+
+
+static void
+end ()
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  GNUNET_ATS_suggest_address_cancel (sched_ats, &p[0].id);
+  GNUNET_ATS_suggest_address_cancel (sched_ats, &p[1].id);
+
+  GNUNET_ATS_scheduling_done (sched_ats);
+  GNUNET_ATS_performance_done (perf_ats);
+  sched_ats = NULL;
+  perf_ats = NULL;
+  free_test_address (&test_addr[0]);
+  free_test_address (&test_addr[1]);
+}
+
+
+static void
+address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+                    struct Session *session,
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+                    const struct GNUNET_ATS_Information *atsi,
+                    uint32_t ats_count)
+{
+  static int stage = 0;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Callback for peer `%s': (in/out) %llu/%llu\n",
+                GNUNET_i2s (&address->peer),
+                ntohl (bandwidth_in.value__),
+                ntohl (bandwidth_out.value__));
+
+  stage ++;
+  if (3 == stage)
+    GNUNET_SCHEDULER_add_now (&end, NULL);
+
+}
+
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+  char *quota_str;
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "ats", "WAN_QUOTA_OUT", &quota_str))
+  {
+      fprintf (stderr, "Cannot load WAN outbound quota from configuration, exit!\n");
+      ret = 1;
+      return;
+  }
+  if  (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_str, &wan_quota_out))
+  {
+      fprintf (stderr, "Cannot load WAN outbound quota from configuration, exit!\n");
+      ret = 1;
+      GNUNET_free (quota_str);
+      return;
+  }
+  GNUNET_free (quota_str);
+  quota_str = NULL;
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "ats", "WAN_QUOTA_IN", &quota_str))
+  {
+      fprintf (stderr, "Cannot load WAN inbound quota from configuration, exit!\n");
+      ret = 1;
+      return;
+  }
+  if  (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_str, &wan_quota_in))
+  {
+      fprintf (stderr, "Cannot load WAN inbound quota from configuration, exit!\n");
+      GNUNET_free (quota_str);
+      ret = 1;
+      return;
+  }
+  GNUNET_free (quota_str);
+  quota_str = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Configured WAN inbound quota: %llu\n", wan_quota_in);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Configured WAN outbound quota: %llu\n", wan_quota_out);
+
+
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+  /* Connect to ATS scheduling */
+  sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
+  if (sched_ats == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
+    ret = 1;
+    end ();
+    return;
+  }
+
+  /* Connect to ATS performance */
+  perf_ats = GNUNET_ATS_performance_init(cfg, NULL, NULL);
+  if (sched_ats == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
+    ret = 1;
+    end ();
+    return;
+  }
+
+
+  /* Set up peer 0 */
+  if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p[0].id.hashPubKey))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+      ret = GNUNET_SYSERR;
+      end ();
+      return;
+  }
+
+  GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p[0].id)));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+              GNUNET_i2s(&p[0].id));
+
+  /* Set up peer 1*/
+  if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID1, &p[1].id.hashPubKey))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+      ret = GNUNET_SYSERR;
+      end ();
+      return;
+  }
+
+  GNUNET_assert (0 == strcmp (PEERID1, GNUNET_i2s_full (&p[1].id)));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+              GNUNET_i2s(&p[1].id));
+
+  /* Prepare ATS Information */
+  test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  test_ats_info[0].value = htonl(GNUNET_ATS_NET_WAN);
+  test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+  test_ats_info[1].value = htonl(1);
+  test_ats_count = 2;
+
+  /* Peer 0: Adding address with session */
+  test_session[0] = &test_addr[0];
+  create_test_address (&test_addr[0], "test0", test_session[0], "test0", strlen ("test0") + 1);
+  test_hello_address[0].peer = p[0].id;
+  test_hello_address[0].transport_name = test_addr[0].plugin;
+  test_hello_address[0].address = test_addr[0].addr;
+  test_hello_address[0].address_length = test_addr[0].addr_len;
+  GNUNET_ATS_address_add (sched_ats, &test_hello_address[0], test_session[0], test_ats_info, test_ats_count);
+
+  /* Peer 1: Adding address with session */
+  test_session[1] = &test_addr[1];
+  create_test_address (&test_addr[1], "test1", test_session[1], "test1", strlen ("test1") + 1);
+  test_hello_address[1].peer = p[1].id;
+  test_hello_address[1].transport_name = test_addr[1].plugin;
+  test_hello_address[1].address = test_addr[1].addr;
+  test_hello_address[1].address_length = test_addr[1].addr_len;
+  GNUNET_ATS_address_add (sched_ats, &test_hello_address[1], test_session[1], test_ats_info, test_ats_count);
+
+  GNUNET_ATS_change_preference (perf_ats, &p[1].id, GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
+  GNUNET_ATS_change_preference (perf_ats, &p[1].id, GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
+
+  GNUNET_ATS_suggest_address (sched_ats, &p[0].id);
+  GNUNET_ATS_suggest_address (sched_ats, &p[1].id);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  if (0 != GNUNET_TESTING_peer_run ("test_ats_simplistic_pref_aging",
+                                    "test_ats_api.conf",
+                                    &run, NULL))
+    return 1;
+  return ret;
+}
+
+
+/* end of file test_ats_simplistic_pref_aging.c */