-cleaning up test logic, modernizing calls, improving test documentation

4 files changed, 451 insertions, 132 deletions

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index f11647d92..d7e933fc6 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -308,16 +308,14 @@ transmit_drop (void *cls, size_t size, void *buf)
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          _("Failed to transmit request to drop database.\n"));
-    GNUNET_SCHEDULER_add_continuation (&disconnect_after_drop, h,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&disconnect_after_drop, h);
     return 0;
   }
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   hdr = buf;
   hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
   hdr->type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_DROP);
-  GNUNET_SCHEDULER_add_continuation (&disconnect_after_drop, h,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&disconnect_after_drop, h);
   return sizeof (struct GNUNET_MessageHeader);
 }
 
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 09b530dbd..082b583c6 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011, 2015 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -31,7 +31,6 @@
  * strategy uses the "random" iterator.  Priorities and expiration
  * dates are set using a pseudo-random value within a realistic range.
  */
-
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
@@ -50,13 +49,13 @@
 #define MAX_SIZE 1024LL * 1024 * 4
 
 /**
- * Report progress outside of major reports? Should probably be GNUNET_YES if
+ * Report progress outside of major reports? Should probably be #GNUNET_YES if
  * size is > 16 MB.
  */
 #define REPORT_ID GNUNET_YES
 
 /**
- * Number of put operations equivalent to 1/3rd of MAX_SIZE
+ * Number of put operations equivalent to 1/3rd of #MAX_SIZE
  */
 #define PUT_10 MAX_SIZE / 32 / 1024 / 3
 
@@ -68,55 +67,146 @@
 #define ITERATIONS 8
 
 
+/**
+ * Number of bytes stored in the datastore in total.
+ */
 static unsigned long long stored_bytes;
 
+/**
+ * Number of entries stored in the datastore in total.
+ */
 static unsigned long long stored_entries;
 
+/**
+ * Number of database operations performed.  Inserting
+ * counts as one operation, deleting as two (as deletion
+ * requires selecting a value for deletion first).
+ */
 static unsigned long long stored_ops;
 
+/**
+ * Start time of the benchmark.
+ */
 static struct GNUNET_TIME_Absolute start_time;
 
+/**
+ * Database backend we use.
+ */
 static const char *plugin_name;
 
+/**
+ * Handle to the datastore.
+ */
 static struct GNUNET_DATASTORE_Handle *datastore;
 
+/**
+ * Value we return from #main().
+ */
 static int ok;
 
-
+/**
+ * Which phase of the process are we in?
+ */
 enum RunPhase
 {
+  /**
+   * We are done (shutting down normally).
+   */
   RP_DONE = 0,
+
+  /**
+   * We are adding new entries to the datastore.
+   */
   RP_PUT,
+
+  /**
+   * We are deleting entries from the datastore.
+   */
   RP_CUT,
+
+  /**
+   * We are generating a report.
+   */
   RP_REPORT,
+
+  /**
+   * Execution failed with some kind of error.
+   */
   RP_ERROR
 };
 
 
+/**
+ * Closure we give to all of the functions executing the
+ * benchmark.  Could right now be global, but this allows
+ * us to theoretically run multiple clients "in parallel".
+ */
 struct CpsRunContext
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
+  /**
+   * Execution phase we are in.
+   */
   enum RunPhase phase;
-  int j;
-  unsigned long long size;
-  int i;
+
+  /**
+   * Size of the value we are currently storing (during #RP_PUT).
+   */
+  size_t size;
+
+  /**
+   * Current iteration counter, we are done with the benchmark
+   * once it hits #ITERATIONS.
+   */
+  unsigned int i;
+
+  /**
+   * Counts the number of items put in the current phase.
+   * Once it hits #PUT_10, we progress tot he #RP_CUT phase
+   * or are done if @e i reaches #ITERATIONS.
+   */
+  unsigned int j;
 };
 
 
+/**
+ * Main state machine.  Executes the next step of the benchmark
+ * depending on the current state.
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param tc scheduler context (unused)
+ */
 static void
-run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_continuation (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
+/**
+ * Continuation called to notify client about result of the insertion
+ * operation.  Checks for errors, updates our iteration counters and
+ * continues execution with #run_continuation().
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param success #GNUNET_SYSERR on failure
+ * @param min_expiration minimum expiration time required for content to be stored
+ *                by the datacache at this time, zero for unknown
+ * @param msg NULL on success, otherwise an error message
+ */
 static void
-check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration,  const char *msg)
+check_success (void *cls,
+               int success,
+               struct GNUNET_TIME_Absolute min_expiration,
+               const char *msg)
 {
   struct CpsRunContext *crc = cls;
 
   if (GNUNET_OK != success)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Check success failed: `%s'\n", msg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Check success failed: `%s'\n",
+                msg);
     crc->phase = RP_ERROR;
-    GNUNET_SCHEDULER_add_now (&run_continuation, crc);
+    GNUNET_SCHEDULER_add_now (&run_continuation,
+                              crc);
     return;
   }
 #if REPORT_ID
@@ -135,45 +225,72 @@ check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiratio
     else
       crc->phase = RP_CUT;
   }
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
 /**
  * Continuation called to notify client about result of the
- * operation.
+ * deletion operation.  Checks for errors and continues
+ * execution with #run_continuation().
  *
- * @param cls closure
- * @param success GNUNET_SYSERR on failure
+ * @param cls the `struct CpsRunContext`
+ * @param success #GNUNET_SYSERR on failure
  * @param min_expiration minimum expiration time required for content to be stored
  *                by the datacache at this time, zero for unknown
  * @param msg NULL on success, otherwise an error message
  */
 static void
-remove_next (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg)
+remove_next (void *cls,
+             int success,
+             struct GNUNET_TIME_Absolute min_expiration,
+             const char *msg)
 {
   struct CpsRunContext *crc = cls;
 
   if (GNUNET_OK != success)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "remove_next failed: `%s'\n", msg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "remove_next failed: `%s'\n",
+                msg);
     crc->phase = RP_ERROR;
-    GNUNET_SCHEDULER_add_now (&run_continuation, crc);
+    GNUNET_SCHEDULER_add_now (&run_continuation,
+                              crc);
     return;
   }
 #if REPORT_ID
   FPRINTF (stderr, "%s",  "D");
 #endif
   GNUNET_assert (GNUNET_OK == success);
-  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
+/**
+ * We have selected a value for deletion, trigger removal.
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param type type of the content
+ * @param priority priority of the content
+ * @param anonymity anonymity-level for the content
+ * @param expiration expiration time for the content
+ * @param uid unique identifier for the datum;
+ *        maybe 0 if no unique identifier is available
+ */
 static void
-delete_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
-              const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
-              uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+delete_value (void *cls,
+              const struct GNUNET_HashCode *key,
+              size_t size,
+              const void *data,
+              enum GNUNET_BLOCK_Type type,
+              uint32_t priority,
+              uint32_t anonymity,
+              struct GNUNET_TIME_Absolute expiration,
               uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
@@ -186,56 +303,86 @@ delete_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
   if (stored_bytes < MAX_SIZE)
     crc->phase = RP_PUT;
   GNUNET_assert (NULL !=
-                 GNUNET_DATASTORE_remove (datastore, key, size, data, 1, 1,
-                                          TIMEOUT, &remove_next, crc));
+                 GNUNET_DATASTORE_remove (datastore,
+                                          key,
+                                          size,
+                                          data, 1, 1,
+                                          TIMEOUT,
+                                          &remove_next, crc));
 }
 
 
+/**
+ * Main state machine.  Executes the next step of the benchmark
+ * depending on the current state.
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param tc scheduler context (unused)
+ */
 static void
-run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_continuation (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct CpsRunContext *crc = cls;
   size_t size;
   static struct GNUNET_HashCode key;
   static char data[65536];
-  int i;
-  int k;
   char gstr[128];
 
   ok = (int) crc->phase;
   switch (crc->phase)
   {
   case RP_PUT:
-    memset (&key, 256 - crc->i, sizeof (struct GNUNET_HashCode));
-    i = crc->j;
-    k = crc->i;
+    memset (&key,
+            256 - crc->i,
+            sizeof (struct GNUNET_HashCode));
     /* most content is 32k */
     size = 32 * 1024;
-    if (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16) == 0) /* but some of it is less! */
-      size = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 32 * 1024);
+    if (0 ==
+        GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                  16)) /* but some of it is less! */
+      size = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                       32 * 1024);
     crc->size = size = size - (size & 7);       /* always multiple of 8 */
-    GNUNET_CRYPTO_hash (&key, sizeof (struct GNUNET_HashCode), &key);
-    memset (data, i, size);
-    if (i > 255)
-      memset (data, i - 255, size / 2);
-    data[0] = k;
+    GNUNET_CRYPTO_hash (&key,
+                        sizeof (struct GNUNET_HashCode),
+                        &key);
+    memset (data,
+            (int) crc->j,
+            size);
+    if (crc->j > 255)
+      memset (data,
+              (int) (crc->j - 255),
+              size / 2);
+    data[0] = crc->i;
     GNUNET_assert (NULL !=
-                   GNUNET_DATASTORE_put (datastore, 0, &key, size, data, i + 1,
+                   GNUNET_DATASTORE_put (datastore,
+                                         0,
+                                         &key,
+                                         size,
+                                         data,
+                                         crc->j + 1,
                                          GNUNET_CRYPTO_random_u32
-                                         (GNUNET_CRYPTO_QUALITY_WEAK, 100), i,
+                                         (GNUNET_CRYPTO_QUALITY_WEAK, 100),
+                                         crc->j,
                                          0,
                                          GNUNET_TIME_relative_to_absolute
                                          (GNUNET_TIME_relative_multiply
                                           (GNUNET_TIME_UNIT_SECONDS,
                                            GNUNET_CRYPTO_random_u32
                                            (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
-                                         1, 1, TIMEOUT, &check_success, crc));
+                                         1,
+                                         1,
+                                         TIMEOUT,
+                                         &check_success, crc));
     break;
   case RP_CUT:
     /* trim down below MAX_SIZE again */
     GNUNET_assert (NULL !=
-                   GNUNET_DATASTORE_get_for_replication (datastore, 1, 1,
-                                                         TIMEOUT, &delete_value,
+                   GNUNET_DATASTORE_get_for_replication (datastore,
+                                                         1, 1,
+                                                         TIMEOUT,
+                                                         &delete_value,
                                                          crc));
     break;
   case RP_REPORT:
@@ -243,23 +390,30 @@ run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #if REPORT_ID
              "\n"
 #endif
-             "Stored %llu kB / %lluk ops / %llu ops/s\n", stored_bytes / 1024,  /* used size in k */
+             "Stored %llu kB / %lluk ops / %llu ops/s\n",
+             stored_bytes / 1024,  /* used size in k */
              stored_ops / 1024, /* total operations (in k) */
              1000LL * 1000LL * stored_ops / (1 +
                                              GNUNET_TIME_absolute_get_duration
                                              (start_time).rel_value_us));
     crc->phase = RP_PUT;
     crc->j = 0;
-    GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&run_continuation,
+                              crc);
     break;
   case RP_DONE:
-    GNUNET_snprintf (gstr, sizeof (gstr), "DATASTORE-%s", plugin_name);
+    GNUNET_snprintf (gstr,
+                     sizeof (gstr),
+                     "DATASTORE-%s",
+                     plugin_name);
     if ((crc->i == ITERATIONS) && (stored_ops > 0))
-      GAUGER (gstr, "PUT operation duration",
+      GAUGER (gstr,
+              "PUT operation duration",
               GNUNET_TIME_absolute_get_duration (start_time).rel_value_us / 1000LL /
-              stored_ops, "ms/operation");
-    GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+              stored_ops,
+              "ms/operation");
+    GNUNET_DATASTORE_disconnect (datastore,
+                                 GNUNET_YES);
     GNUNET_free (crc);
     ok = 0;
     break;
@@ -274,8 +428,23 @@ run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
+/**
+ * Function called with the result of the initial PUT operation.  If
+ * the PUT succeeded, we start the actual benchmark loop, otherwise we
+ * bail out with an error.
+ *
+ *
+ * @param cls closure
+ * @param success #GNUNET_SYSERR on failure
+ * @param min_expiration minimum expiration time required for content to be stored
+ *                by the datacache at this time, zero for unknown
+ * @param msg NULL on success, otherwise an error message
+ */
 static void
-run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg)
+run_tests (void *cls,
+           int success,
+           struct GNUNET_TIME_Absolute min_expiration,
+           const char *msg)
 {
   struct CpsRunContext *crc = cls;
 
@@ -284,15 +453,25 @@ run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, c
     FPRINTF (stderr,
              "Test 'put' operation failed with error `%s' database likely not setup, skipping test.\n",
              msg);
-    GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+    GNUNET_DATASTORE_disconnect (datastore,
+                                 GNUNET_YES);
     GNUNET_free (crc);
     return;
   }
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
+/**
+ * Beginning of the actual execution of the benchmark.
+ * Performs a first test operation (PUT) to verify that
+ * the plugin works at all.
+ *
+ * @param cls NULL
+ * @param cfg configuration to use
+ * @param peer peer handle (unused)
+ */
 static void
 run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -304,30 +483,48 @@ run (void *cls,
   datastore = GNUNET_DATASTORE_connect (cfg);
   start_time = GNUNET_TIME_absolute_get ();
   crc = GNUNET_new (struct CpsRunContext);
-  crc->cfg = cfg;
   crc->phase = RP_PUT;
   if (NULL ==
-      GNUNET_DATASTORE_put (datastore, 0, &zkey, 4, "TEST",
-                            GNUNET_BLOCK_TYPE_TEST, 0, 0, 0,
-                            GNUNET_TIME_relative_to_absolute
-                            (GNUNET_TIME_UNIT_SECONDS), 0, 1,
-                            GNUNET_TIME_UNIT_MINUTES, &run_tests, crc))
+      GNUNET_DATASTORE_put (datastore,
+                            0,
+                            &zkey,
+                            4, "TEST",
+                            GNUNET_BLOCK_TYPE_TEST,
+                            0, 0, 0,
+                            GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_SECONDS),
+                            0, 1,
+                            GNUNET_TIME_UNIT_MINUTES,
+                            &run_tests, crc))
   {
-    FPRINTF (stderr, "%s",  "Test 'put' operation failed.\n");
+    FPRINTF (stderr,
+             "%s",
+             "Test 'put' operation failed.\n");
     ok = 1;
     GNUNET_free (crc);
   }
 }
 
 
+/**
+ * Entry point into the test. Determines which configuration / plugin
+ * we are running with based on the name of the binary and starts
+ * the peer.
+ *
+ * @param argc should be 1
+ * @param argv used to determine plugin / configuration name.
+ * @return 0 on success
+ */
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
   char cfg_name[128];
 
   plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_snprintf (cfg_name, sizeof (cfg_name),
-                   "test_datastore_api_data_%s.conf", plugin_name);
+  GNUNET_snprintf (cfg_name,
+                   sizeof (cfg_name),
+                   "test_datastore_api_data_%s.conf",
+                   plugin_name);
   if (0 !=
       GNUNET_TESTING_peer_run ("perf-gnunet-datastore",
                                cfg_name,
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index a29e01a1e..36e637845 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004, 2005, 2006, 2007, 2009, 2015 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -40,10 +40,16 @@
 
 #define ITERATIONS 256
 
+/**
+ * Handle to the datastore.
+ */
 static struct GNUNET_DATASTORE_Handle *datastore;
 
 static struct GNUNET_TIME_Absolute now;
 
+/**
+ * Value we return from #main().
+ */
 static int ok;
 
 /**
@@ -51,6 +57,7 @@ static int ok;
  */
 static const char *plugin_name;
 
+
 static size_t
 get_size (int i)
 {
@@ -98,9 +105,20 @@ get_expiration (int i)
   return av;
 }
 
+
+/**
+ * Which phase of the process are we in?
+ */
 enum RunPhase
 {
+  /**
+   * We are done (shutting down normally).
+   */
   RP_DONE = 0,
+
+  /**
+   * We are adding new entries to the datastore.
+   */
   RP_PUT = 1,
   RP_GET = 2,
   RP_DEL = 3,
@@ -113,29 +131,61 @@ enum RunPhase
   RP_GET_MULTIPLE_NEXT = 10,
   RP_UPDATE = 11,
   RP_UPDATE_VALIDATE = 12,
+
+  /**
+   * Execution failed with some kind of error.
+   */
   RP_ERROR
 };
 
 
+/**
+ * Closure we give to all of the functions executing the
+ * benchmark.  Could right now be global, but this allows
+ * us to theoretically run multiple clients "in parallel".
+ */
 struct CpsRunContext
 {
+  /**
+   * Execution phase we are in.
+   */
+  enum RunPhase phase;
+
   struct GNUNET_HashCode key;
   int i;
   int rid;
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
   void *data;
   size_t size;
-  enum RunPhase phase;
+
   uint64_t uid;
   uint64_t offset;
   uint64_t first_uid;
 };
 
 
+/**
+ * Main state machine.  Executes the next step of the test
+ * depending on the current state.
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param tc scheduler context (unused)
+ */
 static void
-run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_continuation (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
+/**
+ * Continuation called to notify client about result of an
+ * operation.  Checks for errors, updates our iteration counters and
+ * continues execution with #run_continuation().
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param success #GNUNET_SYSERR on failure
+ * @param min_expiration minimum expiration time required for content to be stored
+ *                by the datacache at this time, zero for unknown
+ * @param msg NULL on success, otherwise an error message
+ */
 static void
 check_success (void *cls,
                int success,
@@ -147,14 +197,15 @@ check_success (void *cls,
   if (GNUNET_OK != success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Operation %d/%d not successfull: `%s'\n", crc->phase, crc->i,
+                "Operation %d/%d not successfull: `%s'\n",
+                crc->phase,
+                crc->i,
                 msg);
     crc->phase = RP_ERROR;
   }
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
 
 
@@ -172,8 +223,8 @@ get_reserved (void *cls,
                 msg);
   GNUNET_assert (0 < success);
   crc->rid = success;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
@@ -199,8 +250,8 @@ check_value (void *cls,
                 crc->phase,
                 crc->i);
     crc->phase = RP_ERROR;
-    GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&run_continuation,
+                              crc);
     return;
   }
 #if 0
@@ -225,8 +276,8 @@ check_value (void *cls,
     crc->phase = RP_DEL;
     crc->i = ITERATIONS;
   }
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
@@ -250,15 +301,20 @@ delete_value (void *cls,
   crc->data = GNUNET_malloc (size);
   memcpy (crc->data, data, size);
   crc->phase = RP_DO_DEL;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
 static void
-check_nothing (void *cls, const struct GNUNET_HashCode * key, size_t size,
-               const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
-               uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+check_nothing (void *cls,
+               const struct GNUNET_HashCode *key,
+               size_t size,
+               const void *data,
+               enum GNUNET_BLOCK_Type type,
+               uint32_t priority,
+               uint32_t anonymity,
+               struct GNUNET_TIME_Absolute expiration,
                uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
@@ -266,8 +322,8 @@ check_nothing (void *cls, const struct GNUNET_HashCode * key, size_t size,
   GNUNET_assert (key == NULL);
   if (crc->i == 0)
     crc->phase = RP_RESERVE;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation,
+                            crc);
 }
 
 
@@ -303,8 +359,7 @@ check_multiple (void *cls,
   }
   if (priority == get_priority (42))
     crc->uid = uid;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
 
 
@@ -330,11 +385,17 @@ check_update (void *cls,
     GNUNET_assert (size == get_size (43));
     crc->offset++;
   }
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
 
 
+/**
+ * Main state machine.  Executes the next step of the test
+ * depending on the current state.
+ *
+ * @param cls the `struct CpsRunContext`
+ * @param tc scheduler context (unused)
+ */
 static void
 run_continuation (void *cls,
                   const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -430,43 +491,68 @@ run_continuation (void *cls,
     break;
   case RP_PUT_MULTIPLE_NEXT:
     crc->phase = RP_GET_MULTIPLE;
-    GNUNET_DATASTORE_put (datastore, crc->rid, &crc->key, get_size (43),
-                          get_data (43), get_type (42), get_priority (43),
-                          get_anonymity (43), 0, get_expiration (43), 1, 1,
-                          TIMEOUT, &check_success, crc);
+    GNUNET_DATASTORE_put (datastore, crc->rid,
+                          &crc->key,
+                          get_size (43),
+                          get_data (43),
+                          get_type (42),
+                          get_priority (43),
+                          get_anonymity (43),
+                          0,
+                          get_expiration (43),
+                          1, 1,
+                          TIMEOUT,
+                          &check_success, crc);
     break;
   case RP_GET_MULTIPLE:
     GNUNET_assert (NULL !=
-                   GNUNET_DATASTORE_get_key (datastore, crc->offset, &crc->key,
-                                             get_type (42), 1, 1, TIMEOUT,
+                   GNUNET_DATASTORE_get_key (datastore,
+                                             crc->offset,
+                                             &crc->key,
+                                             get_type (42), 1, 1,
+                                             TIMEOUT,
                                              &check_multiple, crc));
     break;
   case RP_GET_MULTIPLE_NEXT:
     GNUNET_assert (NULL !=
-                   GNUNET_DATASTORE_get_key (datastore, crc->offset, &crc->key,
-                                             get_type (42), 1, 1, TIMEOUT,
+                   GNUNET_DATASTORE_get_key (datastore,
+                                             crc->offset,
+                                             &crc->key,
+                                             get_type (42),
+                                             1, 1,
+                                             TIMEOUT,
                                              &check_multiple, crc));
     break;
   case RP_UPDATE:
     GNUNET_assert (crc->uid > 0);
     crc->phase = RP_UPDATE_VALIDATE;
-    GNUNET_DATASTORE_update (datastore, crc->uid, 100, get_expiration (42), 1,
-                             1, TIMEOUT, &check_success, crc);
+    GNUNET_DATASTORE_update (datastore,
+                             crc->uid, 100,
+                             get_expiration (42), 1,
+                             1, TIMEOUT,
+                             &check_success, crc);
     break;
   case RP_UPDATE_VALIDATE:
     GNUNET_assert (NULL !=
-                   GNUNET_DATASTORE_get_key (datastore, crc->offset, &crc->key,
-                                             get_type (42), 1, 1, TIMEOUT,
+                   GNUNET_DATASTORE_get_key (datastore,
+                                             crc->offset,
+                                             &crc->key,
+                                             get_type (42),
+                                             1, 1,
+                                             TIMEOUT,
                                              &check_update, crc));
     break;
   case RP_DONE:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished, disconnecting\n");
-    GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Finished, disconnecting\n");
+    GNUNET_DATASTORE_disconnect (datastore,
+                                 GNUNET_YES);
     GNUNET_free (crc);
     ok = 0;
     break;
   case RP_ERROR:
-    GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+    GNUNET_DATASTORE_disconnect (datastore,
+                                 GNUNET_YES);
     GNUNET_free (crc);
     ok = 43;
     break;
@@ -474,6 +560,18 @@ run_continuation (void *cls,
 }
 
 
+/**
+ * Function called with the result of the initial PUT operation.  If
+ * the PUT succeeded, we start the actual benchmark loop, otherwise we
+ * bail out with an error.
+ *
+ *
+ * @param cls closure
+ * @param success #GNUNET_SYSERR on failure
+ * @param min_expiration minimum expiration time required for content to be stored
+ *                by the datacache at this time, zero for unknown
+ * @param msg NULL on success, otherwise an error message
+ */
 static void
 run_tests (void *cls,
            int32_t success,
@@ -485,20 +583,22 @@ run_tests (void *cls,
   switch (success)
   {
   case GNUNET_YES:
-    GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&run_continuation,
+                              crc);
     return;
   case GNUNET_NO:
     FPRINTF (stderr,
              "%s", "Test 'put' operation failed, key already exists (!?)\n");
-    GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+    GNUNET_DATASTORE_disconnect (datastore,
+                                 GNUNET_YES);
     GNUNET_free (crc);
     return;
   case GNUNET_SYSERR:
     FPRINTF (stderr,
              "Test 'put' operation failed with error `%s' database likely not setup, skipping test.\n",
              msg);
-    GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+    GNUNET_DATASTORE_disconnect (datastore,
+                                 GNUNET_YES);
     GNUNET_free (crc);
     return;
   default:
@@ -507,6 +607,15 @@ run_tests (void *cls,
 }
 
 
+/**
+ * Beginning of the actual execution of the benchmark.
+ * Performs a first test operation (PUT) to verify that
+ * the plugin works at all.
+ *
+ * @param cls NULL
+ * @param cfg configuration to use
+ * @param peer peer handle (unused)
+ */
 static void
 run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -516,32 +625,52 @@ run (void *cls,
   static struct GNUNET_HashCode zkey;
 
   crc = GNUNET_new (struct CpsRunContext);
-  crc->cfg = cfg;
   crc->phase = RP_PUT;
   now = GNUNET_TIME_absolute_get ();
   datastore = GNUNET_DATASTORE_connect (cfg);
   if (NULL ==
-      GNUNET_DATASTORE_put (datastore, 0, &zkey, 4, "TEST",
-                            GNUNET_BLOCK_TYPE_TEST, 0, 0, 0,
+      GNUNET_DATASTORE_put (datastore,
+                            0,
+                            &zkey,
+                            4,
+                            "TEST",
+                            GNUNET_BLOCK_TYPE_TEST,
+                            0, 0, 0,
                             GNUNET_TIME_relative_to_absolute
-                            (GNUNET_TIME_UNIT_SECONDS), 0, 1,
-                            GNUNET_TIME_UNIT_MINUTES, &run_tests, crc))
+                            (GNUNET_TIME_UNIT_SECONDS),
+                            0, 1,
+                            GNUNET_TIME_UNIT_MINUTES,
+                            &run_tests, crc))
   {
-    FPRINTF (stderr, "%s",  "Test 'put' operation failed.\n");
+    FPRINTF (stderr,
+             "%s",
+             "Test 'put' operation failed.\n");
     ok = 1;
     GNUNET_free (crc);
   }
 }
 
 
+/**
+ * Entry point into the test. Determines which configuration / plugin
+ * we are running with based on the name of the binary and starts
+ * the peer.
+ *
+ * @param argc should be 1
+ * @param argv used to determine plugin / configuration name.
+ * @return 0 on success
+ */
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
   char cfg_name[128];
 
   plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_snprintf (cfg_name, sizeof (cfg_name),
-                   "test_datastore_api_data_%s.conf", plugin_name);
+  GNUNET_snprintf (cfg_name,
+                   sizeof (cfg_name),
+                   "test_datastore_api_data_%s.conf",
+                   plugin_name);
   if (0 !=
       GNUNET_TESTING_peer_run ("test-gnunet-datastore",
                                cfg_name,
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index e46f094f4..4b888d468 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -132,8 +132,7 @@ check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiratio
   GNUNET_assert (GNUNET_OK == success);
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
 
 
@@ -149,8 +148,7 @@ check_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
   if (NULL == key)
   {
     crc->phase = RP_GET_FAIL;
-    GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&run_continuation, crc);
     return;
   }
   i = crc->i;
@@ -164,8 +162,7 @@ check_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
   crc->i--;
   if (crc->i == 0)
     crc->phase = RP_DONE;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
 
 
@@ -180,8 +177,7 @@ check_nothing (void *cls, const struct GNUNET_HashCode * key, size_t size,
   GNUNET_assert (key == NULL);
   if (0 == --crc->i)
     crc->phase = RP_DONE;
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
 
 
@@ -252,8 +248,7 @@ run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, c
     GNUNET_free (crc);
     return;
   }
-  GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }