use v2

[oweals/gnunet.git] / src / datastore / perf_plugin_datastore.c

diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 26299830a6f7520dadc5677e1b54f24f726e01e8..ea1df5efa12dedc61461dadc874f8132948fb005 100644 (file)
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -140,7 +140,7 @@ iterateDummy (void *cls,
              const GNUNET_HashCode * key,
              uint32_t size,
              const void *data,
-             uint32_t type,
+             enum GNUNET_BLOCK_Type type,
              uint32_t priority,
              uint32_t anonymity,
              struct GNUNET_TIME_Absolute
@@ -168,8 +168,6 @@ iterateDummy (void *cls,
            crc->phase = RP_PUT;
        }
       GNUNET_SCHEDULER_add_after (crc->sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_KEEP,
                                  GNUNET_SCHEDULER_NO_TASK,
                                  &test, crc);
       return GNUNET_OK;
@@ -192,6 +190,7 @@ iterateDummy (void *cls,
  * down.  Unloads our datastore plugin.
  *
  * @param api api to unload
+ * @param cfg configuration to use
  */
 static void
 unload_plugin (struct GNUNET_DATASTORE_PluginFunctions * api,
@@ -253,8 +252,6 @@ test (void *cls,
       crc->i++;
       crc->phase = RP_LP_GET;
       GNUNET_SCHEDULER_add_after (crc->sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_KEEP,
                                  GNUNET_SCHEDULER_NO_TASK,
                                  &test, crc);
       break;
@@ -300,11 +297,8 @@ test (void *cls,
       break;
     case RP_DONE:
       crc->api->drop (crc->api->cls);
-      GNUNET_SCHEDULER_add_delayed (crc->sched,
-                                   GNUNET_YES,
+      GNUNET_SCHEDULER_add_with_priority (crc->sched,
                                    GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                   GNUNET_SCHEDULER_NO_TASK,
-                                   GNUNET_TIME_UNIT_ZERO,
                                    &cleaning_task, crc);
       break;
     }
@@ -363,8 +357,6 @@ run (void *cls,
   crc->cfg = c;
   crc->phase = RP_PUT;
   GNUNET_SCHEDULER_add_after (s,
-                             GNUNET_YES,
-                             GNUNET_SCHEDULER_PRIORITY_KEEP,
                              GNUNET_SCHEDULER_NO_TASK,
                              &test, crc);
 }
@@ -399,6 +391,7 @@ main (int argc, char *argv[])
 {
   int ret;
 
+  GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
   GNUNET_log_setup ("perf-plugin-datastore",
 #if VERBOSE
                     "DEBUG",
@@ -407,6 +400,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
 
   return ret;
 }