gpl3

[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 9d2b1cc6c44785e51c7310e3d7c790681abbf9b2..e6a631b29c04bd47a8f60eb600e927607874c4c9 100644 (file)
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -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;
@@ -254,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;
@@ -301,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;
     }
@@ -364,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);
 }
@@ -400,7 +391,7 @@ main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
+  GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
   GNUNET_log_setup ("perf-plugin-datastore",
 #if VERBOSE
                     "DEBUG",
@@ -409,7 +400,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
+  GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
 
   return ret;
 }