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

[gnunet]

Author: grothoff
Date: 2015-02-28 14:26:30 +0100 (Sat, 28 Feb 2015)
New Revision: 35303

Modified:
   gnunet/src/ats/gnunet-service-ats_preferences.c
Log:
disable solver during aging, ensure there is only one aging task

Modified: gnunet/src/ats/gnunet-service-ats_preferences.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_preferences.c     2015-02-28 13:21:05 UTC 
(rev 35302)
+++ gnunet/src/ats/gnunet-service-ats_preferences.c     2015-02-28 13:26:30 UTC 
(rev 35303)
@@ -397,19 +397,22 @@
   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
   {