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

[gnunet]

Author: wachs
Date: 2013-09-12 09:56:23 +0200 (Thu, 12 Sep 2013)
New Revision: 29223

Modified:
   gnunet/src/ats/gnunet-service-ats-solver_mlp.c
   gnunet/src/ats/gnunet-service-ats_addresses.c
Log:
- bulk deletion for all addresses
- no break, since solve can be called when addresses is empty due to autosolve 
parameter


Modified: gnunet/src/ats/gnunet-service-ats-solver_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats-solver_mlp.c      2013-09-12 07:43:14 UTC 
(rev 29222)
+++ gnunet/src/ats/gnunet-service-ats-solver_mlp.c      2013-09-12 07:56:23 UTC 
(rev 29223)
@@ -1054,10 +1054,7 @@
                return GNUNET_OK;
        }
        if (0 == GNUNET_CONTAINER_multihashmap_size(mlp->addresses))
-       {
-               GNUNET_break (0);
-               return GNUNET_OK;
-       }
+               return GNUNET_OK; /* No addresses available */
 
        if ((GNUNET_NO == mlp->mlp_prob_changed) && (GNUNET_NO == 
mlp->mlp_prob_updated))
        {

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-09-12 07:43:14 UTC 
(rev 29222)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-09-12 07:56:23 UTC 
(rev 29223)
@@ -1202,7 +1202,7 @@
   if (NULL == ea)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Trying to set unknown address `%s', %s %u %s \n",
+                "Trying to set unknown address `%s' `%s' `%u' to %s \n",
                 GNUNET_i2s (peer),
                 plugin_name, session_id,
                 (GNUNET_NO == in_use) ? "NO" : "YES");
@@ -1896,8 +1896,10 @@
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Destroying all addresses\n");
+  handle->s_bulk_start (handle->solver);
   if (handle->addresses != NULL)
     GNUNET_CONTAINER_multihashmap_iterate (handle->addresses, 
&destroy_all_address_it, handle);
+  handle->s_bulk_start (handle->solver);
 }