3 files changed, 88 insertions, 19 deletions

diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index c92e4d3f0..959d088f9 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -77,6 +77,8 @@ static unsigned int num_clients;
 static void
 do_shutdown ()
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Shutting down peerstore, bye.\n");
   if (NULL != db_lib_name)
   {
     GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, db));
@@ -105,6 +107,8 @@ do_shutdown ()
 static void
 shutdown_task (void *cls)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Priming PEERSTORE for shutdown.\n");
   in_shutdown = GNUNET_YES;
   if (0 == num_clients) /* Only when no connected clients. */
     do_shutdown ();
@@ -176,6 +180,8 @@ client_connect_cb (void *cls,
                    struct GNUNET_MQ_Handle *mq)
 {
   num_clients++;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "A client connected (now %u)\n", num_clients);
   return client;
 }
 
@@ -195,7 +201,7 @@ client_disconnect_it (void *cls, const struct GNUNET_HashCode *key, void *value)
   {
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CONTAINER_multihashmap_remove (watchers, key, value));
-    num_clients++;
+    num_clients++; /* Watchers do not count */
   }
   return GNUNET_OK;
 }
@@ -212,12 +218,14 @@ client_disconnect_cb (void *cls,
                       struct GNUNET_SERVICE_Client *client,
                       void *app_cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "A client disconnected, cleaning up.\n");
+  num_clients--;
   if (NULL != watchers)
     GNUNET_CONTAINER_multihashmap_iterate (watchers,
                                            &client_disconnect_it,
                                            client);
-  num_clients--;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "A client disconnected (%u remaining).\n",
+              num_clients);
   if ((0 == num_clients) && in_shutdown)
     do_shutdown ();
 }
@@ -540,6 +548,7 @@ run (void *cls,
   char *database;
 
   in_shutdown = GNUNET_NO;
+  num_clients = 0;
   cfg = c;
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
                                                           "peerstore",
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index db5aee0d5..196d44faa 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -823,7 +823,12 @@ reconnect (void *cls)
                                  &handle_client_error,
                                  h);
   if (NULL == h->mq)
+  {
+    h->reconnect_task =
+      GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
+    h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
     return;
+  }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Resending pending requests after reconnect.\n");
   if (NULL != h->watches)
diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c
index 4c826c654..5057c98b5 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -67,6 +67,24 @@ static const char *val = "test_peerstore_api_store_val";
 
 
 /**
+ * Timeout
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+
+/**
+ * Timeout task
+ */
+static struct GNUNET_SCHEDULER_Task *to;
+
+/**
+ * Iterate handle
+ */
+static struct GNUNET_PEERSTORE_IterateContext *it;
+
+static void
+test_cont (void *cls);
+
+/**
  * Function that should be called with the result of the
  * lookup, and finally once with NULL to signal the end
  * of the iteration.
@@ -89,9 +107,24 @@ iterate_cb (void *cls,
   GNUNET_break (NULL == emsg);
   if (NULL == record)
   {
-    GNUNET_PEERSTORE_disconnect (h,
-                                 GNUNET_NO);
-    GNUNET_SCHEDULER_shutdown ();
+    it = NULL;
+    if (0 == ok)
+    {
+      GNUNET_PEERSTORE_disconnect (h,
+                                   GNUNET_NO);
+      if (NULL != to)
+      {
+        GNUNET_SCHEDULER_cancel (to);
+        to = NULL;
+      }
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    /**
+     * Try again
+     */
+    GNUNET_SCHEDULER_add_now (&test_cont,
+                              NULL);
     return;
   }
   rec_val = record->value;
@@ -100,6 +133,22 @@ iterate_cb (void *cls,
 }
 
 
+static void
+timeout_task (void *cls)
+{
+  to = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Timeout reached\n");
+  if (NULL != it)
+    GNUNET_PEERSTORE_iterate_cancel (it);
+  it = NULL;
+  GNUNET_PEERSTORE_disconnect (h,
+                               GNUNET_NO);
+  GNUNET_SCHEDULER_shutdown ();
+  return;
+}
+
+
 /**
  * Run the 2nd stage of the test where we fetch the
  * data that should have been stored.
@@ -109,12 +158,11 @@ iterate_cb (void *cls,
 static void
 test_cont (void *cls)
 {
-  h = GNUNET_PEERSTORE_connect (cfg);
-  GNUNET_PEERSTORE_iterate (h,
-                            subsystem,
-                            &pid, key,
-                            &iterate_cb,
-                            NULL);
+  it = GNUNET_PEERSTORE_iterate (h,
+                                 subsystem,
+                                 &pid, key,
+                                 &iterate_cb,
+                                 NULL);
 }
 
 
@@ -122,10 +170,9 @@ static void
 disc_cont (void *cls)
 {
   GNUNET_PEERSTORE_disconnect (h, GNUNET_YES);
-  h = NULL;
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &test_cont,
-                                NULL);
+  h = GNUNET_PEERSTORE_connect (cfg);
+  GNUNET_SCHEDULER_add_now (&test_cont,
+                            NULL);
 }
 
 
@@ -133,12 +180,17 @@ static void
 store_cont (void *cls, int success)
 {
   ok = success;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Success: %s\n",
+              (GNUNET_SYSERR == ok) ? "no" : "yes");
   /* We need to wait a little bit to give the disconnect
      a chance to actually finish the operation; otherwise,
      the test may fail non-deterministically if the new
      connection is faster than the cleanup routine of the
-     old one. */GNUNET_SCHEDULER_add_now (&disc_cont,
-                            NULL);
+     old one. */
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                &disc_cont,
+                                NULL);
 }
 
 
@@ -174,7 +226,10 @@ run (void *cls,
 {
   cfg = c;
   memset (&pid, 1, sizeof(pid));
-  test1 ();
+  to = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                     &timeout_task,
+                                     NULL);
+  GNUNET_SCHEDULER_add_now (&test1, NULL);
 }