1 files changed, 24 insertions, 89 deletions

diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index cdbd6ae..cf21ebe 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -36,19 +36,14 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_service.h"
+#include "gnunet_testing_lib.h"
 #include <gauger.h>
 
-#define VERBOSE GNUNET_NO
-
 /**
  * How long until we give up on transmitting the message?
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
-static const char *plugin_name;
-
-static struct GNUNET_DATASTORE_Handle *datastore;
-
 /**
  * Target datastore size (in bytes).
  */
@@ -81,8 +76,13 @@ static unsigned long long stored_ops;
 
 static struct GNUNET_TIME_Absolute start_time;
 
+static const char *plugin_name;
+
+static struct GNUNET_DATASTORE_Handle *datastore;
+
 static int ok;
 
+
 enum RunPhase
 {
   RP_DONE = 0,
@@ -103,13 +103,10 @@ struct CpsRunContext
 };
 
 
-
 static void
 run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
-
-
 static void
 check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration,  const char *msg)
 {
@@ -174,7 +171,7 @@ remove_next (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration,
 
 
 static void
-delete_value (void *cls, const GNUNET_HashCode * key, size_t size,
+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)
@@ -199,7 +196,7 @@ run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct CpsRunContext *crc = cls;
   size_t size;
-  static GNUNET_HashCode key;
+  static struct GNUNET_HashCode key;
   static char data[65536];
   int i;
   int k;
@@ -209,7 +206,7 @@ run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   switch (crc->phase)
   {
   case RP_PUT:
-    memset (&key, 256 - crc->i, sizeof (GNUNET_HashCode));
+    memset (&key, 256 - crc->i, sizeof (struct GNUNET_HashCode));
     i = crc->j;
     k = crc->i;
     /* most content is 32k */
@@ -217,7 +214,7 @@ run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     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);
     crc->size = size = size - (size & 7);       /* always multiple of 8 */
-    GNUNET_CRYPTO_hash (&key, sizeof (GNUNET_HashCode), &key);
+    GNUNET_CRYPTO_hash (&key, sizeof (struct GNUNET_HashCode), &key);
     memset (data, i, size);
     if (i > 255)
       memset (data, i - 255, size / 2);
@@ -297,11 +294,12 @@ run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, c
 
 
 static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, 
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct CpsRunContext *crc;
-  static GNUNET_HashCode zkey;
+  static struct GNUNET_HashCode zkey;
 
   datastore = GNUNET_DATASTORE_connect (cfg);
   start_time = GNUNET_TIME_absolute_get ();
@@ -322,85 +320,22 @@ run (void *cls, char *const *args, const char *cfgfile,
 }
 
 
-static int
-check ()
+int
+main (int argc, char *argv[])
 {
-  struct GNUNET_OS_Process *proc;
   char cfg_name[128];
 
-  char *const argv[] = {
-    "perf-datastore-api",
-    "-c",
-    cfg_name,
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
+  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);
-  proc =
-      GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
-                               "gnunet-service-arm",
-#if VERBOSE
-                               "-L", "DEBUG",
-#endif
-                               "-c", cfg_name, NULL);
-  GNUNET_assert (NULL != proc);
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                      "perf-datastore-api", "nohelp", options, &run, NULL);
-  sleep (1);                    /* give datastore chance to process 'DROP' */
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    ok = 1;
-  }
-  GNUNET_OS_process_wait (proc);
-  GNUNET_OS_process_destroy (proc);
-  proc = NULL;
+  if (0 !=
+      GNUNET_TESTING_peer_run ("perf-gnunet-datastore",
+			       cfg_name,
+			       &run,
+			       NULL))
+    return 1;
+  FPRINTF (stderr, "%s", "\n");
   return ok;
 }
 
-
-int
-main (int argc, char *argv[])
-{
-  int ret;
-  char *pos;
-  char dir_name[128];
-
-  sleep (1);
-  /* determine name of plugin to use */
-  plugin_name = argv[0];
-  while (NULL != (pos = strstr (plugin_name, "_")))
-    plugin_name = pos + 1;
-  if (NULL != (pos = strstr (plugin_name, ".")))
-    pos[0] = 0;
-  else
-    pos = (char *) plugin_name;
-
-  GNUNET_snprintf (dir_name, sizeof (dir_name), "/tmp/test-gnunet-datastore-%s",
-                   plugin_name);
-  GNUNET_DISK_directory_remove (dir_name);
-  GNUNET_log_setup ("perf-datastore-api",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret = check ();
-  if (pos != plugin_name)
-    pos[0] = '.';
-#if REPORT_ID
-  FPRINTF (stderr, "%s",  "\n");
-#endif
-  GNUNET_DISK_directory_remove (dir_name);
-  return ret;
-}
-
 /* end of perf_datastore_api.c */