-only trigger check config if we actually need it

[oweals/gnunet.git] / src / ats / gnunet-service-ats_preferences.c

diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c
index 3be6d3525fa84b39ae712dc794fef85f8bd2ce33..c835b026bd00b99d911732572ee7672dc66006ab 100644 (file)
--- a/src/ats/gnunet-service-ats_preferences.c
+++ b/src/ats/gnunet-service-ats_preferences.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-2015 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      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.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file ats/gnunet-service-ats_preferences.c
@@ -62,7 +62,7 @@ struct PeerRelative
    * Array of relative preference values, to be indexed by
    * an `enum GNUNET_ATS_PreferenceKind`.
    */
-  double f_rel[GNUNET_ATS_PreferenceCount];
+  double f_rel[GNUNET_ATS_PREFERENCE_END];
 
   /**
    * Number of clients that are expressing a preference for
@@ -99,14 +99,14 @@ struct PreferencePeer
    * Absolute preference values for all preference types
    * as expressed by this client for this peer.
    */
-  double f_abs[GNUNET_ATS_PreferenceCount];
+  double f_abs[GNUNET_ATS_PREFERENCE_END];
 
   /**
    * Relative preference values for all preference types,
    * normalized in [0..1] based on how the respective
    * client scored other peers.
    */
-  double f_rel[GNUNET_ATS_PreferenceCount];
+  double f_rel[GNUNET_ATS_PREFERENCE_END];
 
 };
 
@@ -144,7 +144,7 @@ struct PreferenceClient
    * Array of sums of absolute preferences for all
    * peers as expressed by this client.
    */
-  double f_abs_sum[GNUNET_ATS_PreferenceCount];
+  double f_abs_sum[GNUNET_ATS_PREFERENCE_END];
 
 };
 
@@ -353,7 +353,7 @@ age_values (void *cls,
   int dead;
 
   dead = GNUNET_YES;
-  for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
+  for (i = 0; i < GNUNET_ATS_PREFERENCE_END; i++)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Aging preference for peer `%s'\n",
@@ -388,28 +388,29 @@ age_values (void *cls,
  * Reduce absolute preferences since they got old.
  *
  * @param cls unused
- * @param tc context
  */
 static void
-preference_aging (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+preference_aging (void *cls)
 {
   struct AgeContext ac;
 
   aging_task = NULL;
+  GAS_plugin_solver_lock ();
   ac.values_to_update = 0;
   for (ac.cur_client = pc_head; NULL != ac.cur_client; ac.cur_client = ac.cur_client->next)
     GNUNET_CONTAINER_multipeermap_iterate (ac.cur_client->peer2pref,
                                            &age_values,
                                            &ac);
+  GAS_plugin_solver_unlock ();
   if (ac.values_to_update > 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Rescheduling aging task due to %u elements remaining to age\n",
                 ac.values_to_update);
-    aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL,
-                                               &preference_aging,
-                                               NULL);
+    if (NULL == aging_task)
+      aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL,
+                                                 &preference_aging,
+                                                 NULL);
   }
   else
   {
@@ -563,7 +564,7 @@ update_preference (struct GNUNET_SERVER_Client *client,
   struct PeerRelative *r_cur;
   unsigned int i;
 
-  if (kind >= GNUNET_ATS_PreferenceCount)
+  if (kind >= GNUNET_ATS_PREFERENCE_END)
   {
     GNUNET_break(0);
     return;
@@ -582,9 +583,10 @@ update_preference (struct GNUNET_SERVER_Client *client,
   if (NULL == c_cur)
   {
     c_cur = GNUNET_new (struct PreferenceClient);
+    c_cur->client = client;
     c_cur->peer2pref = GNUNET_CONTAINER_multipeermap_create (16,
                                                              GNUNET_NO);
-    for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
+    for (i = 0; i < GNUNET_ATS_PREFERENCE_END; i++)
       c_cur->f_abs_sum[i] = DEFAULT_ABS_PREFERENCE;
     GNUNET_CONTAINER_DLL_insert (pc_head,
                                  pc_tail,
@@ -598,7 +600,7 @@ update_preference (struct GNUNET_SERVER_Client *client,
   {
     /* Create struct for peer */
     r_cur = GNUNET_new (struct PeerRelative);
-    for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
+    for (i = 0; i < GNUNET_ATS_PREFERENCE_END; i++)
       r_cur->f_rel[i] = DEFAULT_REL_PREFERENCE;
     GNUNET_assert (GNUNET_OK ==
                    GNUNET_CONTAINER_multipeermap_put (preference_peers,
@@ -614,7 +616,7 @@ update_preference (struct GNUNET_SERVER_Client *client,
   {
     /* Not found: create new peer entry */
     p_cur = GNUNET_new (struct PreferencePeer);
-    for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
+    for (i = 0; i < GNUNET_ATS_PREFERENCE_END; i++)
     {
       /* Default value per peer absolute preference for a preference*/
       p_cur->f_abs[i] = DEFAULT_ABS_PREFERENCE;
@@ -710,7 +712,7 @@ GAS_preference_init ()
 
   preference_peers = GNUNET_CONTAINER_multipeermap_create (16,
                                                            GNUNET_NO);
-  for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
+  for (i = 0; i < GNUNET_ATS_PREFERENCE_END; i++)
     defvalues.f_rel[i] = DEFAULT_REL_PREFERENCE;
 }