-fix testcases, ensure shutdown works properly

3 files changed, 270 insertions, 57 deletions

diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c
index d04877b39..19d63d00b 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -21,6 +21,7 @@
 /**
  * @file set/test_set_api.c
  * @brief testcase for set_api.c
+ * @author Florian Dold
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -38,6 +39,10 @@ static struct GNUNET_SET_Handle *set2;
 
 static struct GNUNET_SET_ListenHandle *listen_handle;
 
+static struct GNUNET_SET_OperationHandle *oh1;
+
+static struct GNUNET_SET_OperationHandle *oh2;
+
 static const struct GNUNET_CONFIGURATION_Handle *config;
 
 static unsigned int iter_count;
@@ -60,18 +65,26 @@ result_cb_set1 (void *cls,
     break;
   case GNUNET_SET_STATUS_FAILURE:
     GNUNET_break (0);
+    oh1 = NULL;
     fprintf (stderr,
              "set 1: received failure status!\n");
     ret = 1;
-    GNUNET_SCHEDULER_cancel (tt);
-    tt = NULL;
+    if (NULL != tt)
+    {
+      GNUNET_SCHEDULER_cancel (tt);
+      tt = NULL;
+    }
     GNUNET_SCHEDULER_shutdown ();
     break;
   case GNUNET_SET_STATUS_DONE:
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "set 1: done\n");
-    GNUNET_SET_destroy (set1);
-    set1 = NULL;
+    oh1 = NULL;
+    if (NULL != set1)
+    {
+      GNUNET_SET_destroy (set1);
+      set1 = NULL;
+    }
     if (NULL == set2)
     {
       GNUNET_SCHEDULER_cancel (tt);
@@ -98,11 +111,13 @@ result_cb_set2 (void *cls,
     break;
   case GNUNET_SET_STATUS_FAILURE:
     GNUNET_break (0);
+    oh2 = NULL;
     fprintf (stderr,
              "set 2: received failure status\n");
     ret = 1;
     break;
   case GNUNET_SET_STATUS_DONE:
+    oh2 = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "set 2: done\n");
     GNUNET_SET_destroy (set2);
@@ -126,19 +141,18 @@ listen_cb (void *cls,
            const struct GNUNET_MessageHeader *context_msg,
            struct GNUNET_SET_Request *request)
 {
-  struct GNUNET_SET_OperationHandle *oh;
-
   GNUNET_assert (NULL != context_msg);
-
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_TEST);
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "listen cb called\n");
   GNUNET_SET_listen_cancel (listen_handle);
-  oh = GNUNET_SET_accept (request,
-                          GNUNET_SET_RESULT_ADDED,
-                          &result_cb_set2, NULL);
-  GNUNET_SET_commit (oh, set2);
+  listen_handle = NULL;
+  oh2 = GNUNET_SET_accept (request,
+                           GNUNET_SET_RESULT_ADDED,
+                           &result_cb_set2,
+                           NULL);
+  GNUNET_SET_commit (oh,
+                     set2);
 }
 
 
@@ -150,18 +164,25 @@ listen_cb (void *cls,
 static void
 start (void *cls)
 {
-  struct GNUNET_SET_OperationHandle *oh;
   struct GNUNET_MessageHeader context_msg;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting reconciliation\n");
   context_msg.size = htons (sizeof context_msg);
   context_msg.type = htons (GNUNET_MESSAGE_TYPE_TEST);
-
-  listen_handle = GNUNET_SET_listen (config, GNUNET_SET_OPERATION_UNION,
-                                     &app_id, listen_cb, NULL);
-  oh = GNUNET_SET_prepare (&local_id, &app_id, &context_msg,
-                           GNUNET_SET_RESULT_ADDED,
-                           result_cb_set1, NULL);
-  GNUNET_SET_commit (oh, set1);
+  listen_handle = GNUNET_SET_listen (config,
+                                     GNUNET_SET_OPERATION_UNION,
+                                     &app_id,
+                                     &listen_cb,
+                                     NULL);
+  oh1 = GNUNET_SET_prepare (&local_id,
+                            &app_id,
+                            &context_msg,
+                            GNUNET_SET_RESULT_ADDED,
+                            &result_cb_set1,
+                            NULL);
+  GNUNET_SET_commit (oh1,
+                     set1);
 }
 
 
@@ -187,7 +208,7 @@ init_set2 (void *cls)
   GNUNET_SET_add_element (set2, &element, NULL, NULL);
   element.data = "baz";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2, &element, start, NULL);
+  GNUNET_SET_add_element (set2, &element, &start, NULL);
 }
 
 
@@ -208,7 +229,8 @@ init_set1 (void)
   element.size = strlen(element.data);
   GNUNET_SET_add_element (set1, &element, init_set2, NULL);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized set 1\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "initialized set 1\n");
 }
 
 
@@ -255,7 +277,7 @@ test_iter ()
 
 
 /**
- * Signature of the main function of a task.
+ * Function run on timeout.
  *
  * @param cls closure
  */
@@ -263,12 +285,55 @@ static void
 timeout_fail (void *cls)
 {
   tt = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "Testcase failed with timeout\n");
   GNUNET_SCHEDULER_shutdown ();
   ret = 1;
 }
 
 
 /**
+ * Function run on shutdown.
+ *
+ * @param cls closure
+ */
+static void
+do_shutdown (void *cls)
+{
+  if (NULL != tt)
+  {
+    GNUNET_SCHEDULER_cancel (tt);
+    tt = NULL;
+  }
+  if (NULL != oh1)
+  {
+    GNUNET_SET_operation_cancel (oh1);
+    oh1 = NULL;
+  }
+  if (NULL != oh2)
+  {
+    GNUNET_SET_operation_cancel (oh2);
+    oh2 = NULL;
+  }
+  if (NULL != set1)
+  {
+    GNUNET_SET_destroy (set1);
+    set1 = NULL;
+  }
+  if (NULL != set2)
+  {
+    GNUNET_SET_destroy (set2);
+    set2 = NULL;
+  }
+  if (NULL != listen_handle)
+  {
+    GNUNET_SET_listen_cancel (listen_handle);
+    listen_handle = NULL;
+  }
+}
+
+
+/**
  * Signature of the 'main' function for a (single-peer) testcase that
  * is run using 'GNUNET_TESTING_peer_run'.
  *
@@ -284,8 +349,13 @@ run (void *cls,
 
   struct GNUNET_SET_OperationHandle *my_oh;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Running preparatory tests\n");
   tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5),
-                                     &timeout_fail, NULL);
+                                     &timeout_fail,
+                                     NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
 
   config = cfg;
   GNUNET_CRYPTO_get_peer_identity (cfg, &local_id);
@@ -304,12 +374,18 @@ run (void *cls,
                                     &app_id);
 
   ///* test if canceling an uncommited request works! */
-  my_oh = GNUNET_SET_prepare (&local_id, &app_id, NULL,
-                              GNUNET_SET_RESULT_ADDED, NULL, NULL);
+  my_oh = GNUNET_SET_prepare (&local_id,
+                              &app_id,
+                              NULL,
+                              GNUNET_SET_RESULT_ADDED,
+                              NULL,
+                              NULL);
 
   GNUNET_SET_operation_cancel (my_oh);
 
   /* test the real set reconciliation */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Running real set-reconciliation\n");
   init_set1 ();
 }
 
@@ -317,6 +393,11 @@ run (void *cls,
 int
 main (int argc, char **argv)
 {
+  GNUNET_log_setup ("test_set_api",
+                    "WARNING",
+                    NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Launching peer\n");
   if (0 != GNUNET_TESTING_peer_run ("test_set_api",
                                     "test_set.conf",
                                     &run, NULL))
diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c
index 9a5d0aa43..9c2f64bc1 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -46,6 +46,12 @@ static const struct GNUNET_CONFIGURATION_Handle *config;
 
 static int iter_count;
 
+static struct GNUNET_SCHEDULER_Task *tt;
+
+static struct GNUNET_SET_OperationHandle *oh1;
+
+static struct GNUNET_SET_OperationHandle *oh2;
+
 
 static void
 result_cb_set1 (void *cls,
@@ -60,11 +66,14 @@ result_cb_set1 (void *cls,
     count++;
     break;
   case GNUNET_SET_STATUS_FAILURE:
+    oh1 = NULL;
     ret = 1;
     break;
   case GNUNET_SET_STATUS_DONE:
+    oh1 = NULL;
     GNUNET_assert (1 == count);
     GNUNET_SET_destroy (set1);
+    set1 = NULL;
     break;
   default:
     GNUNET_assert (0);
@@ -85,11 +94,14 @@ result_cb_set2 (void *cls,
     count++;
     break;
   case GNUNET_SET_STATUS_FAILURE:
+    oh2 = NULL;
     ret = 1;
     break;
   case GNUNET_SET_STATUS_DONE:
+    oh2 = NULL;
     GNUNET_assert (1 == count);
     GNUNET_SET_destroy (set2);
+    set2 = NULL;
     break;
   default:
     GNUNET_assert (0);
@@ -103,15 +115,16 @@ listen_cb (void *cls,
            const struct GNUNET_MessageHeader *context_msg,
            struct GNUNET_SET_Request *request)
 {
-  struct GNUNET_SET_OperationHandle *oh;
-
   GNUNET_assert (NULL != context_msg);
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_TEST);
   GNUNET_SET_listen_cancel (listen_handle);
-  oh = GNUNET_SET_accept (request,
+  listen_handle = NULL;
+  oh2 = GNUNET_SET_accept (request,
                           GNUNET_SET_RESULT_FULL,
-                          &result_cb_set2, NULL);
-  GNUNET_SET_commit (oh, set2);
+                          &result_cb_set2,
+                          NULL);
+  GNUNET_SET_commit (oh2,
+                     set2);
 }
 
 
@@ -123,7 +136,6 @@ listen_cb (void *cls,
 static void
 start (void *cls)
 {
-  struct GNUNET_SET_OperationHandle *oh;
   struct GNUNET_MessageHeader context_msg;
 
   context_msg.size = htons (sizeof context_msg);
@@ -132,12 +144,14 @@ start (void *cls)
                                      GNUNET_SET_OPERATION_INTERSECTION,
                                      &app_id,
                                      &listen_cb, NULL);
-  oh = GNUNET_SET_prepare (&local_id,
+  oh1 = GNUNET_SET_prepare (&local_id,
                            &app_id,
                            &context_msg,
                            GNUNET_SET_RESULT_FULL,
-                           &result_cb_set1, NULL);
-  GNUNET_SET_commit (oh, set1);
+                           &result_cb_set1,
+                            NULL);
+  GNUNET_SET_commit (oh1,
+                     set1);
 }
 
 
@@ -216,7 +230,66 @@ test_iter ()
   element.data = "quux";
   element.size = strlen(element.data);
   GNUNET_SET_add_element (iter_set, &element, NULL, NULL);
-  GNUNET_SET_iterate (iter_set, &iter_cb, iter_set);
+  GNUNET_SET_iterate (iter_set,
+                      &iter_cb,
+                      iter_set);
+}
+
+
+/**
+ * Function run on shutdown.
+ *
+ * @param cls closure
+ */
+static void
+do_shutdown (void *cls)
+{
+  if (NULL != tt)
+  {
+    GNUNET_SCHEDULER_cancel (tt);
+    tt = NULL;
+  }
+  if (NULL != oh1)
+  {
+    GNUNET_SET_operation_cancel (oh1);
+    oh1 = NULL;
+  }
+  if (NULL != oh2)
+  {
+    GNUNET_SET_operation_cancel (oh2);
+    oh2 = NULL;
+  }
+  if (NULL != set1)
+  {
+    GNUNET_SET_destroy (set1);
+    set1 = NULL;
+  }
+  if (NULL != set2)
+  {
+    GNUNET_SET_destroy (set2);
+    set2 = NULL;
+  }
+  if (NULL != listen_handle)
+  {
+    GNUNET_SET_listen_cancel (listen_handle);
+    listen_handle = NULL;
+  }
+}
+
+
+/**
+ * Function run on timeout.
+ *
+ * @param cls closure
+ */
+static void
+timeout_fail (void *cls)
+{
+  tt = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "Testcase failed with timeout\n");
+  GNUNET_SCHEDULER_shutdown ();
+  ret = 1;
 }
 
 
@@ -237,9 +310,16 @@ run (void *cls,
   GNUNET_TESTING_peer_get_identity (peer, &local_id);
   if (0) test_iter ();
 
+  tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5),
+                                     &timeout_fail,
+                                     NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
+
   set1 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_INTERSECTION);
   set2 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_INTERSECTION);
-  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
+  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
+                                    &app_id);
 
   /* test the real set reconciliation */
   init_set1 ();
@@ -255,4 +335,3 @@ main (int argc, char **argv)
     return 1;
   return ret;
 }
-
diff --git a/src/set/test_set_union_result_symmetric.c b/src/set/test_set_union_result_symmetric.c
index ec5bd936c..9a02cfefc 100644
--- a/src/set/test_set_union_result_symmetric.c
+++ b/src/set/test_set_union_result_symmetric.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2012 GNUnet e.V.
+     Copyright (C) 2012, 2016 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
@@ -21,6 +21,8 @@
 /**
  * @file set/test_set_union_result_smmetric
  * @brief testcase for symmetric result mode of the union set operation
+ * @author Florian Dold
+ * @author Christian Grothoff
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -36,6 +38,7 @@ static int ret;
 static struct GNUNET_PeerIdentity local_id;
 
 static struct GNUNET_HashCode app_id;
+
 static struct GNUNET_SET_Handle *set1;
 
 static struct GNUNET_SET_Handle *set2;
@@ -44,6 +47,10 @@ static struct GNUNET_SET_ListenHandle *listen_handle;
 
 static const struct GNUNET_CONFIGURATION_Handle *config;
 
+static struct GNUNET_SET_OperationHandle *oh1;
+
+static struct GNUNET_SET_OperationHandle *oh2;
+
 static int iter_count;
 
 /**
@@ -82,6 +89,7 @@ result_cb_set1 (void *cls,
     case GNUNET_SET_STATUS_FAILURE:
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "set 1: failure\n");
+      oh1 = NULL;
       ret = 1;
       if (NULL != timeout_task)
       {
@@ -91,6 +99,7 @@ result_cb_set1 (void *cls,
       GNUNET_SCHEDULER_shutdown ();
       break;
     case GNUNET_SET_STATUS_DONE:
+      oh1 = NULL;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "set 1: done\n");
       GNUNET_SET_destroy (set1);
@@ -128,6 +137,7 @@ result_cb_set2 (void *cls,
     case GNUNET_SET_STATUS_FAILURE:
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "set 2: failure\n");
+      oh2 = NULL;
       ret = 1;
       if (NULL != timeout_task)
       {
@@ -139,6 +149,7 @@ result_cb_set2 (void *cls,
     case GNUNET_SET_STATUS_DONE:
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "set 2: done\n");
+      oh2 = NULL;
       GNUNET_SET_destroy (set2);
       set2 = NULL;
       if (NULL == set1)
@@ -165,18 +176,18 @@ listen_cb (void *cls,
            const struct GNUNET_MessageHeader *context_msg,
            struct GNUNET_SET_Request *request)
 {
-  struct GNUNET_SET_OperationHandle *oh;
-
   GNUNET_assert (NULL != context_msg);
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_TEST);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "listen cb called\n");
   GNUNET_SET_listen_cancel (listen_handle);
-  oh = GNUNET_SET_accept (request,
-                          GNUNET_SET_RESULT_SYMMETRIC,
-                          &result_cb_set2,
-                          NULL);
-  GNUNET_SET_commit (oh, set2);
+  listen_handle = NULL;
+  oh2 = GNUNET_SET_accept (request,
+                           GNUNET_SET_RESULT_SYMMETRIC,
+                           &result_cb_set2,
+                           NULL);
+  GNUNET_SET_commit (oh2,
+                     set2);
 }
 
 
@@ -188,7 +199,6 @@ listen_cb (void *cls,
 static void
 start (void *cls)
 {
-  struct GNUNET_SET_OperationHandle *oh;
   struct GNUNET_MessageHeader context_msg;
 
   context_msg.size = htons (sizeof context_msg);
@@ -198,12 +208,12 @@ start (void *cls)
                                      GNUNET_SET_OPERATION_UNION,
                                      &app_id,
                                      &listen_cb, NULL);
-  oh = GNUNET_SET_prepare (&local_id,
-                           &app_id,
-                           &context_msg,
-                           GNUNET_SET_RESULT_SYMMETRIC,
-                           &result_cb_set1, NULL);
-  GNUNET_SET_commit (oh, set1);
+  oh1 = GNUNET_SET_prepare (&local_id,
+                            &app_id,
+                            &context_msg,
+                            GNUNET_SET_RESULT_SYMMETRIC,
+                            &result_cb_set1, NULL);
+  GNUNET_SET_commit (oh1, set1);
 }
 
 
@@ -335,6 +345,47 @@ timeout_fail (void *cls)
 
 
 /**
+ * Function run on shutdown.
+ *
+ * @param cls closure
+ */
+static void
+do_shutdown (void *cls)
+{
+  if (NULL != timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = NULL;
+  }
+  if (NULL != oh1)
+  {
+    GNUNET_SET_operation_cancel (oh1);
+    oh1 = NULL;
+  }
+  if (NULL != oh2)
+  {
+    GNUNET_SET_operation_cancel (oh2);
+    oh2 = NULL;
+  }
+  if (NULL != set1)
+  {
+    GNUNET_SET_destroy (set1);
+    set1 = NULL;
+  }
+  if (NULL != set2)
+  {
+    GNUNET_SET_destroy (set2);
+    set2 = NULL;
+  }
+  if (NULL != listen_handle)
+  {
+    GNUNET_SET_listen_cancel (listen_handle);
+    listen_handle = NULL;
+  }
+}
+
+
+/**
  * Signature of the 'main' function for a (single-peer) testcase that
  * is run using 'GNUNET_TESTING_peer_run'.
  *
@@ -350,12 +401,14 @@ run (void *cls,
   timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5),
                                                &timeout_fail,
                                                NULL);
-
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
   config = cfg;
   GNUNET_TESTING_peer_get_identity (peer,
                                     &local_id);
 
-  test_iter ();
+  if (0)
+    test_iter ();
 
   set1 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
   set2 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
@@ -385,7 +438,7 @@ main (int argc, char **argv)
   {
     return 1;
   }
-  GNUNET_assert (2 == count_set1);
-  GNUNET_assert (1 == count_set2);
+  GNUNET_break (2 == count_set1);
+  GNUNET_break (1 == count_set2);
   return ret;
 }