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

[gnunet]

Author: grothoff
Date: 2016-03-16 22:48:33 +0100 (Wed, 16 Mar 2016)
New Revision: 36936

Modified:
   gnunet/src/ats/gnunet-service-ats.c
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_connectivity.c
Log:
lock solver during shutdown to terminate faster

Modified: gnunet/src/ats/gnunet-service-ats.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats.c 2016-03-16 18:08:04 UTC (rev 36935)
+++ gnunet/src/ats/gnunet-service-ats.c 2016-03-16 21:48:33 UTC (rev 36936)
@@ -130,6 +130,8 @@
 cleanup_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ATS shutdown initiated\n");
   GAS_connectivity_done ();
   GAS_addresses_done ();
   GAS_plugin_done ();

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2016-03-16 18:08:04 UTC 
(rev 36935)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2016-03-16 21:48:33 UTC 
(rev 36936)
@@ -405,7 +405,9 @@
 {
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
              "Shutting down addresses\n");
+  GAS_plugin_solver_lock ();
   GAS_addresses_destroy_all ();
+  GAS_plugin_solver_unlock ();
   GNUNET_CONTAINER_multipeermap_destroy (GSA_addresses);
   GSA_addresses = NULL;
 }

Modified: gnunet/src/ats/gnunet-service-ats_connectivity.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_connectivity.c    2016-03-16 18:08:04 UTC 
(rev 36935)
+++ gnunet/src/ats/gnunet-service-ats_connectivity.c    2016-03-16 21:48:33 UTC 
(rev 36936)
@@ -217,9 +217,11 @@
 void
 GAS_connectivity_done ()
 {
+  GAS_plugin_solver_lock ();
   GNUNET_CONTAINER_multipeermap_iterate (connection_requests,
                                          &free_request,
                                          NULL);
+  GAS_plugin_solver_unlock ();
   GNUNET_CONTAINER_multipeermap_destroy (connection_requests);
   connection_requests = NULL;
 }