1 files changed, 302 insertions, 285 deletions

diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index a051f27ca..a1604d441 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -59,7 +59,8 @@ static const char *plugin_name;
 
 static int ok;
 
-enum RunPhase {
+enum RunPhase
+{
   RP_ERROR = 0,
   RP_PUT,
   RP_REP_GET,
@@ -69,7 +70,8 @@ enum RunPhase {
 };
 
 
-struct CpsRunContext {
+struct CpsRunContext
+{
   unsigned int i;
   struct GNUNET_TIME_Absolute start;
   struct GNUNET_TIME_Absolute end;
@@ -91,13 +93,13 @@ struct CpsRunContext {
  *        0 for "reset to empty"
  */
 static void
-disk_utilization_change_cb(void *cls, int delta)
+disk_utilization_change_cb (void *cls, int delta)
 {
 }
 
 
 static void
-test(void *cls);
+test (void *cls);
 
 
 /**
@@ -110,30 +112,30 @@ test(void *cls);
  * @param msg error message on error
  */
 static void
-put_continuation(void *cls,
-                 const struct GNUNET_HashCode *key,
-                 uint32_t size,
-                 int status,
-                 const char *msg)
+put_continuation (void *cls,
+                  const struct GNUNET_HashCode *key,
+                  uint32_t size,
+                  int status,
+                  const char *msg)
 {
   struct CpsRunContext *crc = cls;
 
   if (GNUNET_OK != status)
-    {
-      fprintf(stderr, "ERROR: `%s'\n", msg);
-    }
+  {
+    fprintf (stderr, "ERROR: `%s'\n", msg);
+  }
   else
-    {
-      stored_bytes += size;
-      stored_ops++;
-      stored_entries++;
-    }
-  GNUNET_SCHEDULER_add_now(&test, crc);
+  {
+    stored_bytes += size;
+    stored_ops++;
+    stored_entries++;
+  }
+  GNUNET_SCHEDULER_add_now (&test, crc);
 }
 
 
 static void
-do_put(struct CpsRunContext *crc)
+do_put (struct CpsRunContext *crc)
 {
   char value[65536];
   size_t size;
@@ -142,123 +144,69 @@ do_put(struct CpsRunContext *crc)
   unsigned int prio;
 
   if (0 == i)
-    crc->start = GNUNET_TIME_absolute_get();
+    crc->start = GNUNET_TIME_absolute_get ();
   if (PUT_10 == i)
+  {
+    i = 0;
+    crc->end = GNUNET_TIME_absolute_get ();
     {
-      i = 0;
-      crc->end = GNUNET_TIME_absolute_get();
-      {
-        printf("%s took %s for %llu items\n", "Storing an item",
-               GNUNET_STRINGS_relative_time_to_string(GNUNET_TIME_absolute_get_difference(crc->start,
-                                                                                          crc->end),
-                                                      GNUNET_YES),
-               PUT_10);
-        if (PUT_10 > 0)
-          GAUGER(category, "Storing an item",
-                 (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / PUT_10,
-                 "ms/item");
-      }
-      crc->i++;
-      crc->start = GNUNET_TIME_absolute_get();
-      crc->phase++;
-      GNUNET_SCHEDULER_add_now(&test, crc);
-      return;
+      printf ("%s took %s for %llu items\n", "Storing an item",
+              GNUNET_STRINGS_relative_time_to_string (
+                GNUNET_TIME_absolute_get_difference (crc->start,
+                                                     crc
+                                                     ->end),
+                GNUNET_YES),
+              PUT_10);
+      if (PUT_10 > 0)
+        GAUGER (category, "Storing an item",
+                (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL
+                / PUT_10,
+                "ms/item");
     }
+    crc->i++;
+    crc->start = GNUNET_TIME_absolute_get ();
+    crc->phase++;
+    GNUNET_SCHEDULER_add_now (&test, crc);
+    return;
+  }
   /* 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 = 8 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 32 * 1024);
+  if (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16) == 0)   /* but some of it is less! */
+    size = 8 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 32 * 1024);
   size = size - (size & 7);     /* always multiple of 8 */
 
   /* generate random key */
-  key.bits[0] = (unsigned int)GNUNET_TIME_absolute_get().abs_value_us;
-  GNUNET_CRYPTO_hash(&key, sizeof(struct GNUNET_HashCode), &key);
-  memset(value, i, size);
+  key.bits[0] = (unsigned int) GNUNET_TIME_absolute_get ().abs_value_us;
+  GNUNET_CRYPTO_hash (&key, sizeof(struct GNUNET_HashCode), &key);
+  memset (value, i, size);
   if (i > 255)
-    memset(value, i - 255, size / 2);
+    memset (value, i - 255, size / 2);
   value[0] = crc->i;
-  GNUNET_memcpy(&value[4], &i, sizeof(i));
-  prio = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100);
-  crc->api->put(crc->api->cls,
-                &key,
-                false /* absent */,
-                size,
-                value,
-                1 + i % 4 /* type */,
-                prio,
-                i % 4 /* anonymity */,
-                0 /* replication */,
-                GNUNET_TIME_relative_to_absolute
-                  (GNUNET_TIME_relative_multiply
-                    (GNUNET_TIME_UNIT_MILLISECONDS,
-                    60 * 60 * 60 * 1000 +
-                    GNUNET_CRYPTO_random_u32
-                      (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
-                put_continuation,
-                crc);
+  GNUNET_memcpy (&value[4], &i, sizeof(i));
+  prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
+  crc->api->put (crc->api->cls,
+                 &key,
+                 false /* absent */,
+                 size,
+                 value,
+                 1 + i % 4 /* type */,
+                 prio,
+                 i % 4 /* anonymity */,
+                 0 /* replication */,
+                 GNUNET_TIME_relative_to_absolute
+                   (GNUNET_TIME_relative_multiply
+                     (GNUNET_TIME_UNIT_MILLISECONDS,
+                     60 * 60 * 60 * 1000
+                     + GNUNET_CRYPTO_random_u32
+                       (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
+                 put_continuation,
+                 crc);
   i++;
 }
 
 
 static int
-iterate_zeros(void *cls,
-              const struct GNUNET_HashCode *key,
-              uint32_t size,
-              const void *data,
-              enum GNUNET_BLOCK_Type type,
-              uint32_t priority,
-              uint32_t anonymity,
-              uint32_t replication,
-              struct GNUNET_TIME_Absolute expiration,
-              uint64_t uid)
-{
-  struct CpsRunContext *crc = cls;
-  int i;
-  const char *cdata = data;
-
-  GNUNET_assert(key != NULL);
-  GNUNET_assert(size >= 8);
-  GNUNET_memcpy(&i, &cdata[4], sizeof(i));
-  hits[i / 8] |= (1 << (i % 8));
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Found result %d type=%u, priority=%u, size=%u, expire=%s\n",
-             i,
-             type, priority, size,
-             GNUNET_STRINGS_absolute_time_to_string(expiration));
-  crc->cnt++;
-  if (crc->cnt == PUT_10 / 4 - 1)
-    {
-      unsigned int bc;
-
-      bc = 0;
-      for (i = 0; i < PUT_10; i++)
-        if (0 != (hits[i / 8] & (1 << (i % 8))))
-          bc++;
-
-      crc->end = GNUNET_TIME_absolute_get();
-      printf("%s took %s yielding %u/%u items\n",
-             "Select random zero-anonymity item",
-             GNUNET_STRINGS_relative_time_to_string(GNUNET_TIME_absolute_get_difference(crc->start,
-                                                                                        crc->end),
-                                                    GNUNET_YES),
-             bc, crc->cnt);
-      if (crc->cnt > 0)
-        GAUGER(category, "Select random zero-anonymity item",
-               (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / crc->cnt,
-               "ms/item");
-      memset(hits, 0, sizeof(hits));
-      crc->phase++;
-      crc->cnt = 0;
-      crc->start = GNUNET_TIME_absolute_get();
-    }
-  GNUNET_SCHEDULER_add_now(&test, crc);
-  return GNUNET_OK;
-}
-
-
-static int
-expiration_get(void *cls,
+iterate_zeros (void *cls,
                const struct GNUNET_HashCode *key,
                uint32_t size,
                const void *data,
@@ -273,45 +221,52 @@ expiration_get(void *cls,
   int i;
   const char *cdata = data;
 
-  GNUNET_assert(size >= 8);
-  GNUNET_memcpy(&i, &cdata[4], sizeof(i));
+  GNUNET_assert (key != NULL);
+  GNUNET_assert (size >= 8);
+  GNUNET_memcpy (&i, &cdata[4], sizeof(i));
   hits[i / 8] |= (1 << (i % 8));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Found result %d type=%u, priority=%u, size=%u, expire=%s\n",
+              i,
+              type, priority, size,
+              GNUNET_STRINGS_absolute_time_to_string (expiration));
   crc->cnt++;
-  if (PUT_10 <= crc->cnt)
-    {
-      unsigned int bc;
-
-      bc = 0;
-      for (i = 0; i < PUT_10; i++)
-        if (0 != (hits[i / 8] & (1 << (i % 8))))
-          bc++;
-
-      crc->end = GNUNET_TIME_absolute_get();
-      printf("%s took %s yielding %u/%u items\n",
-             "Selecting and deleting by expiration",
-             GNUNET_STRINGS_relative_time_to_string(GNUNET_TIME_absolute_get_difference(crc->start,
-                                                                                        crc->end),
-                                                    GNUNET_YES),
-             bc, (unsigned int)PUT_10);
-      if (crc->cnt > 0)
-        GAUGER(category, "Selecting and deleting by expiration",
-               (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / crc->cnt,
-               "ms/item");
-      memset(hits, 0, sizeof(hits));
-      if (++crc->iter == ITERATIONS)
-        crc->phase++;
-      else
-        crc->phase = RP_PUT;
-      crc->cnt = 0;
-      crc->start = GNUNET_TIME_absolute_get();
-    }
-  GNUNET_SCHEDULER_add_now(&test, crc);
-  return GNUNET_NO;
+  if (crc->cnt == PUT_10 / 4 - 1)
+  {
+    unsigned int bc;
+
+    bc = 0;
+    for (i = 0; i < PUT_10; i++)
+      if (0 != (hits[i / 8] & (1 << (i % 8))))
+        bc++;
+
+    crc->end = GNUNET_TIME_absolute_get ();
+    printf ("%s took %s yielding %u/%u items\n",
+            "Select random zero-anonymity item",
+            GNUNET_STRINGS_relative_time_to_string (
+              GNUNET_TIME_absolute_get_difference (crc->start,
+                                                   crc
+                                                   ->end),
+              GNUNET_YES),
+            bc, crc->cnt);
+    if (crc->cnt > 0)
+      GAUGER (category, "Select random zero-anonymity item",
+              (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL
+              / crc->cnt,
+              "ms/item");
+    memset (hits, 0, sizeof(hits));
+    crc->phase++;
+    crc->cnt = 0;
+    crc->start = GNUNET_TIME_absolute_get ();
+  }
+  GNUNET_SCHEDULER_add_now (&test, crc);
+  return GNUNET_OK;
 }
 
 
 static int
-replication_get(void *cls,
+expiration_get (void *cls,
                 const struct GNUNET_HashCode *key,
                 uint32_t size,
                 const void *data,
@@ -326,39 +281,98 @@ replication_get(void *cls,
   int i;
   const char *cdata = data;
 
-  GNUNET_assert(NULL != key);
-  GNUNET_assert(size >= 8);
-  GNUNET_memcpy(&i, &cdata[4], sizeof(i));
+  GNUNET_assert (size >= 8);
+  GNUNET_memcpy (&i, &cdata[4], sizeof(i));
   hits[i / 8] |= (1 << (i % 8));
   crc->cnt++;
   if (PUT_10 <= crc->cnt)
-    {
-      unsigned int bc;
-
-      bc = 0;
-      for (i = 0; i < PUT_10; i++)
-        if (0 != (hits[i / 8] & (1 << (i % 8))))
-          bc++;
-
-      crc->end = GNUNET_TIME_absolute_get();
-      printf("%s took %s yielding %u/%u items\n",
-             "Selecting random item for replication",
-             GNUNET_STRINGS_relative_time_to_string(GNUNET_TIME_absolute_get_difference(crc->start,
-                                                                                        crc->end),
-                                                    GNUNET_YES),
-             bc, (unsigned int)PUT_10);
-      if (crc->cnt > 0)
-        GAUGER(category, "Selecting random item for replication",
-               (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL / crc->cnt,
-               "ms/item");
-      memset(hits, 0, sizeof(hits));
+  {
+    unsigned int bc;
+
+    bc = 0;
+    for (i = 0; i < PUT_10; i++)
+      if (0 != (hits[i / 8] & (1 << (i % 8))))
+        bc++;
+
+    crc->end = GNUNET_TIME_absolute_get ();
+    printf ("%s took %s yielding %u/%u items\n",
+            "Selecting and deleting by expiration",
+            GNUNET_STRINGS_relative_time_to_string (
+              GNUNET_TIME_absolute_get_difference (crc->start,
+                                                   crc
+                                                   ->end),
+              GNUNET_YES),
+            bc, (unsigned int) PUT_10);
+    if (crc->cnt > 0)
+      GAUGER (category, "Selecting and deleting by expiration",
+              (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL
+              / crc->cnt,
+              "ms/item");
+    memset (hits, 0, sizeof(hits));
+    if (++crc->iter == ITERATIONS)
       crc->phase++;
-      crc->offset = 0;
-      crc->cnt = 0;
-      crc->start = GNUNET_TIME_absolute_get();
-    }
+    else
+      crc->phase = RP_PUT;
+    crc->cnt = 0;
+    crc->start = GNUNET_TIME_absolute_get ();
+  }
+  GNUNET_SCHEDULER_add_now (&test, crc);
+  return GNUNET_NO;
+}
+
+
+static int
+replication_get (void *cls,
+                 const struct GNUNET_HashCode *key,
+                 uint32_t size,
+                 const void *data,
+                 enum GNUNET_BLOCK_Type type,
+                 uint32_t priority,
+                 uint32_t anonymity,
+                 uint32_t replication,
+                 struct GNUNET_TIME_Absolute expiration,
+                 uint64_t uid)
+{
+  struct CpsRunContext *crc = cls;
+  int i;
+  const char *cdata = data;
 
-  GNUNET_SCHEDULER_add_now(&test, crc);
+  GNUNET_assert (NULL != key);
+  GNUNET_assert (size >= 8);
+  GNUNET_memcpy (&i, &cdata[4], sizeof(i));
+  hits[i / 8] |= (1 << (i % 8));
+  crc->cnt++;
+  if (PUT_10 <= crc->cnt)
+  {
+    unsigned int bc;
+
+    bc = 0;
+    for (i = 0; i < PUT_10; i++)
+      if (0 != (hits[i / 8] & (1 << (i % 8))))
+        bc++;
+
+    crc->end = GNUNET_TIME_absolute_get ();
+    printf ("%s took %s yielding %u/%u items\n",
+            "Selecting random item for replication",
+            GNUNET_STRINGS_relative_time_to_string (
+              GNUNET_TIME_absolute_get_difference (crc->start,
+                                                   crc
+                                                   ->end),
+              GNUNET_YES),
+            bc, (unsigned int) PUT_10);
+    if (crc->cnt > 0)
+      GAUGER (category, "Selecting random item for replication",
+              (crc->end.abs_value_us - crc->start.abs_value_us) / 1000LL
+              / crc->cnt,
+              "ms/item");
+    memset (hits, 0, sizeof(hits));
+    crc->phase++;
+    crc->offset = 0;
+    crc->cnt = 0;
+    crc->start = GNUNET_TIME_absolute_get ();
+  }
+
+  GNUNET_SCHEDULER_add_now (&test, crc);
   return GNUNET_OK;
 }
 
@@ -371,25 +385,26 @@ replication_get(void *cls,
  * @param cfg configuration to use
  */
 static void
-unload_plugin(struct GNUNET_DATASTORE_PluginFunctions *api,
-              const struct GNUNET_CONFIGURATION_Handle *cfg)
+unload_plugin (struct GNUNET_DATASTORE_PluginFunctions *api,
+               const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   char *name;
   char *libname;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string(cfg, "DATASTORE", "DATABASE",
-                                            &name))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("No `%s' specified for `%s' in configuration!\n"), "DATABASE",
-                 "DATASTORE");
-      return;
-    }
-  GNUNET_asprintf(&libname, "libgnunet_plugin_datastore_%s", name);
-  GNUNET_break(NULL == GNUNET_PLUGIN_unload(libname, api));
-  GNUNET_free(libname);
-  GNUNET_free(name);
+      GNUNET_CONFIGURATION_get_value_string (cfg, "DATASTORE", "DATABASE",
+                                             &name))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("No `%s' specified for `%s' in configuration!\n"),
+                "DATABASE",
+                "DATASTORE");
+    return;
+  }
+  GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
+  GNUNET_break (NULL == GNUNET_PLUGIN_unload (libname, api));
+  GNUNET_free (libname);
+  GNUNET_free (name);
 }
 
 
@@ -399,56 +414,56 @@ unload_plugin(struct GNUNET_DATASTORE_PluginFunctions *api,
  * the transport and core.
  */
 static void
-cleaning_task(void *cls)
+cleaning_task (void *cls)
 {
   struct CpsRunContext *crc = cls;
 
-  unload_plugin(crc->api, crc->cfg);
-  GNUNET_free(crc);
+  unload_plugin (crc->api, crc->cfg);
+  GNUNET_free (crc);
 }
 
 
 static void
-test(void *cls)
+test (void *cls)
 {
   struct CpsRunContext *crc = cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "In phase %d, iteration %u\n", crc->phase, crc->cnt);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "In phase %d, iteration %u\n", crc->phase, crc->cnt);
   switch (crc->phase)
-    {
-    case RP_ERROR:
-      GNUNET_break(0);
-      crc->api->drop(crc->api->cls);
-      ok = 1;
-      GNUNET_SCHEDULER_add_with_priority(GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                         &cleaning_task, crc);
-      break;
-
-    case RP_PUT:
-      do_put(crc);
-      break;
-
-    case RP_REP_GET:
-      crc->api->get_replication(crc->api->cls, &replication_get, crc);
-      break;
-
-    case RP_ZA_GET:
-      crc->api->get_zero_anonymity(crc->api->cls, crc->offset++, 1,
-                                   &iterate_zeros, crc);
-      break;
-
-    case RP_EXP_GET:
-      crc->api->get_expiration(crc->api->cls, &expiration_get, crc);
-      break;
-
-    case RP_DONE:
-      crc->api->drop(crc->api->cls);
-      ok = 0;
-      GNUNET_SCHEDULER_add_with_priority(GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                         &cleaning_task, crc);
-      break;
-    }
+  {
+  case RP_ERROR:
+    GNUNET_break (0);
+    crc->api->drop (crc->api->cls);
+    ok = 1;
+    GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                        &cleaning_task, crc);
+    break;
+
+  case RP_PUT:
+    do_put (crc);
+    break;
+
+  case RP_REP_GET:
+    crc->api->get_replication (crc->api->cls, &replication_get, crc);
+    break;
+
+  case RP_ZA_GET:
+    crc->api->get_zero_anonymity (crc->api->cls, crc->offset++, 1,
+                                  &iterate_zeros, crc);
+    break;
+
+  case RP_EXP_GET:
+    crc->api->get_expiration (crc->api->cls, &expiration_get, crc);
+    break;
+
+  case RP_DONE:
+    crc->api->drop (crc->api->cls);
+    ok = 0;
+    GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                        &cleaning_task, crc);
+    break;
+  }
 }
 
 
@@ -456,7 +471,7 @@ test(void *cls)
  * Load the datastore plugin.
  */
 static struct GNUNET_DATASTORE_PluginFunctions *
-load_plugin(const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static struct GNUNET_DATASTORE_PluginEnvironment env;
   struct GNUNET_DATASTORE_PluginFunctions *ret;
@@ -464,63 +479,65 @@ load_plugin(const struct GNUNET_CONFIGURATION_Handle *cfg)
   char *libname;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string(cfg, "DATASTORE", "DATABASE",
-                                            &name))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("No `%s' specified for `%s' in configuration!\n"), "DATABASE",
-                 "DATASTORE");
-      return NULL;
-    }
+      GNUNET_CONFIGURATION_get_value_string (cfg, "DATASTORE", "DATABASE",
+                                             &name))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("No `%s' specified for `%s' in configuration!\n"),
+                "DATABASE",
+                "DATASTORE");
+    return NULL;
+  }
   env.cfg = cfg;
   env.duc = &disk_utilization_change_cb;
   env.cls = NULL;
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Loading `%s' datastore plugin\n"),
-             name);
-  GNUNET_asprintf(&libname, "libgnunet_plugin_datastore_%s", name);
-  if (NULL == (ret = GNUNET_PLUGIN_load(libname, &env)))
-    {
-      fprintf(stderr, "Failed to load plugin `%s'!\n", name);
-      GNUNET_free(name);
-      GNUNET_free(libname);
-      return NULL;
-    }
-  GNUNET_free(libname);
-  GNUNET_free(name);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Loading `%s' datastore plugin\n"),
+              name);
+  GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
+  if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
+  {
+    fprintf (stderr, "Failed to load plugin `%s'!\n", name);
+    GNUNET_free (name);
+    GNUNET_free (libname);
+    return NULL;
+  }
+  GNUNET_free (libname);
+  GNUNET_free (name);
   return ret;
 }
 
 
 static void
-run(void *cls, char *const *args, const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   struct GNUNET_DATASTORE_PluginFunctions *api;
   struct CpsRunContext *crc;
 
   if (NULL == c)
-    {
-      GNUNET_break(0);
-      return;
-    }
-  api = load_plugin(c);
+  {
+    GNUNET_break (0);
+    return;
+  }
+  api = load_plugin (c);
   if (api == NULL)
-    {
-      fprintf(stderr,
-              "%s", "Could not initialize plugin, assuming database not configured. Test not run!\n");
-      return;
-    }
-  crc = GNUNET_new(struct CpsRunContext);
+  {
+    fprintf (stderr,
+             "%s",
+             "Could not initialize plugin, assuming database not configured. Test not run!\n");
+    return;
+  }
+  crc = GNUNET_new (struct CpsRunContext);
   crc->api = api;
   crc->cfg = c;
   crc->phase = RP_PUT;
   ok = 2;
-  GNUNET_SCHEDULER_add_now(&test, crc);
+  GNUNET_SCHEDULER_add_now (&test, crc);
 }
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   char dir_name[PATH_MAX];
   char cfg_name[PATH_MAX];
@@ -534,21 +551,21 @@ main(int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
-  plugin_name = GNUNET_TESTING_get_testname_from_underscore(argv[0]);
-  GNUNET_snprintf(dir_name, sizeof(dir_name), "/tmp/perf-gnunet-datastore-%s",
-                  plugin_name);
-  GNUNET_DISK_directory_remove(dir_name);
-  GNUNET_log_setup("perf-plugin-datastore",
-                   "WARNING",
-                   NULL);
-  GNUNET_snprintf(category, sizeof(category), "DATASTORE-%s", plugin_name);
-  GNUNET_snprintf(cfg_name, sizeof(cfg_name),
-                  "perf_plugin_datastore_data_%s.conf", plugin_name);
-  GNUNET_PROGRAM_run((sizeof(xargv) / sizeof(char *)) - 1, xargv,
-                     "perf-plugin-datastore", "nohelp", options, &run, NULL);
+  plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+  GNUNET_snprintf (dir_name, sizeof(dir_name), "/tmp/perf-gnunet-datastore-%s",
+                   plugin_name);
+  GNUNET_DISK_directory_remove (dir_name);
+  GNUNET_log_setup ("perf-plugin-datastore",
+                    "WARNING",
+                    NULL);
+  GNUNET_snprintf (category, sizeof(category), "DATASTORE-%s", plugin_name);
+  GNUNET_snprintf (cfg_name, sizeof(cfg_name),
+                   "perf_plugin_datastore_data_%s.conf", plugin_name);
+  GNUNET_PROGRAM_run ((sizeof(xargv) / sizeof(char *)) - 1, xargv,
+                      "perf-plugin-datastore", "nohelp", options, &run, NULL);
   if (ok != 0)
-    fprintf(stderr, "Missed some testcases: %u\n", ok);
-  GNUNET_DISK_directory_remove(dir_name);
+    fprintf (stderr, "Missed some testcases: %u\n", ok);
+  GNUNET_DISK_directory_remove (dir_name);
 
   return ok;
 }