-only trigger check config if we actually need it

[oweals/gnunet.git] / src / dht / test_dht_api.c

diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index b1c39e893ea833546f282181cb91d7f69a1c93d0..99f17699c4d9b3842f071fc5f7382e984548ad1f 100644 (file)
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2015 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
@@ -14,15 +14,14 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file dht/test_dht_api.c
  * @brief base test case for dht api
  *
  * This test case tests DHT api to DUMMY DHT service communication.
- *
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -59,7 +58,7 @@ struct RetryContext
   /**
    * The task identifier of the retry task, so it can be cancelled.
    */
-  GNUNET_SCHEDULER_TaskIdentifier retry_task;
+  struct GNUNET_SCHEDULER_Task * retry_task;
 
 };
 
@@ -72,7 +71,7 @@ struct RetryContext retry_context;
 
 static int ok = 1;
 
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
 
 
 #if VERBOSE
@@ -83,10 +82,10 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 
 static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
 {
   GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_NO_TASK;
+  die_task = NULL;
   GNUNET_DHT_disconnect (dht_handle);
   dht_handle = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -105,7 +104,7 @@ end_badly ()
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping get request!\n");
     GNUNET_DHT_get_stop (get_handle);
   }
-  if (retry_context.retry_task != GNUNET_SCHEDULER_NO_TASK)
+  if (retry_context.retry_task != NULL)
     GNUNET_SCHEDULER_cancel (retry_context.retry_task);
   GNUNET_DHT_disconnect (dht_handle);
   dht_handle = NULL;
@@ -117,20 +116,13 @@ end_badly ()
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
  */
 static void
-test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+test_get_stop (void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get_stop!\n");
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
-  GNUNET_assert (dht_handle != NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Called test_get_stop!\n");
+  GNUNET_assert (NULL != dht_handle);
   GNUNET_DHT_get_stop (get_handle);
   get_handle = NULL;
   GNUNET_SCHEDULER_add_now (&end, NULL);
@@ -143,13 +135,14 @@ test_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
                    const struct GNUNET_PeerIdentity *get_path,
                    unsigned int get_path_length,
                    const struct GNUNET_PeerIdentity *put_path,
-                   unsigned int put_path_length, enum GNUNET_BLOCK_Type type,
+                   unsigned int put_path_length,
+                   enum GNUNET_BLOCK_Type type,
                    size_t size, const void *data)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "test_get_iterator called (we got a result), stopping get request!\n");
-  GNUNET_SCHEDULER_add_continuation (&test_get_stop, NULL,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&test_get_stop,
+                            NULL);
 }
 
 
@@ -164,15 +157,18 @@ test_get (void *cls, int success)
 {
   struct GNUNET_HashCode hash;
 
-  memset (&hash, 42, sizeof (struct GNUNET_HashCode));
+  memset (&hash,
+          42,
+          sizeof (struct GNUNET_HashCode));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get!\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Called test_get!\n");
   GNUNET_assert (dht_handle != NULL);
   retry_context.real_timeout = GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT);
   retry_context.next_timeout = BASE_TIMEOUT;
 
   get_handle =
-      GNUNET_DHT_get_start (dht_handle, 
+      GNUNET_DHT_get_start (dht_handle,
                             GNUNET_BLOCK_TYPE_TEST, &hash, 1,
                             GNUNET_DHT_RO_NONE, NULL, 0, &test_get_iterator,
                             NULL);
@@ -203,6 +199,7 @@ run (void *cls,
                                     (GNUNET_TIME_UNIT_MINUTES, 1), &end_badly,
                                     NULL);
 
+
   memset (&hash, 42, sizeof (struct GNUNET_HashCode));
   data = GNUNET_malloc (data_size);
   memset (data, 43, data_size);
@@ -212,7 +209,7 @@ run (void *cls,
   GNUNET_DHT_put (dht_handle, &hash, 1, GNUNET_DHT_RO_NONE,
                   GNUNET_BLOCK_TYPE_TEST, data_size, data,
                   GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT),
-                  TOTAL_TIMEOUT, &test_get, NULL);
+                  &test_get, NULL);
   GNUNET_free (data);
 }