use v2

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

diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 87b3662998ba9cfe1ccde9cc887efe8af9e8f1d1..23ff7c49a8e848fef8d1f61a3cfc53f5c6733079 100644 (file)
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -93,7 +93,7 @@ enum RunPhase
 struct CpsRunContext
 {
   struct GNUNET_SCHEDULER_Handle *sched;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
   enum RunPhase phase;
   int j;
   unsigned long long size;
@@ -140,7 +140,6 @@ check_success (void *cls,
        crc->phase = RP_CUT;
     }
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -167,7 +166,6 @@ remove_next(void *cls,
 #endif
   GNUNET_assert (GNUNET_OK == success);
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -188,9 +186,9 @@ do_delete (void *cls,
                           &crc->key,
                           crc->esize,
                           crc->data,
+                          1, 1, TIMEOUT,
                           &remove_next,
-                          crc,
-                          TIMEOUT);
+                          crc);
 }
 
 
@@ -200,7 +198,7 @@ delete_value (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
@@ -214,26 +212,27 @@ delete_value (void *cls,
        {
          crc->phase = RP_REPORT;
          GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                            GNUNET_NO,
                                             &run_continuation,
                                             crc,
                                             GNUNET_SCHEDULER_REASON_PREREQ_DONE);
          return;     
        }
-      GNUNET_SCHEDULER_add_after (crc->sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                 GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
-                                 &do_delete,
-                                 crc);
+      GNUNET_SCHEDULER_add_with_priority (crc->sched,
+                                         GNUNET_SCHEDULER_PRIORITY_HIGH,
+                                         &do_delete,
+                                         crc);
       return;
     }
   stored_ops++;
   if (stored_bytes < MAX_SIZE)
-    return;     
+    {
+      GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
+      return;     
+    }
   crc->key = *key;
   crc->esize = size;
   memcpy (crc->data, data, size);
+  GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
 }
 
 
@@ -276,19 +275,18 @@ run_continuation (void *cls,
                            GNUNET_TIME_relative_to_absolute 
                            (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
                                                            GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
-                           TIMEOUT,
+                           1, 1, TIMEOUT,
                            &check_success, 
                            crc);
       break;
     case RP_CUT:
       /* trim down below MAX_SIZE again */
       GNUNET_DATASTORE_get_random (datastore, 
+                                  1, 1, TIMEOUT,
                                   &delete_value,
-                                  crc,
-                                  TIMEOUT);
+                                  crc);
       break;
     case RP_REPORT:
-      size = 0;
       printf (
 #if REPORT_ID
                "\n"
@@ -300,15 +298,17 @@ run_continuation (void *cls,
       crc->phase = RP_PUT;
       crc->j = 0;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        GNUNET_NO,
                                         &run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
     case RP_DONE:
       GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+      GNUNET_free (crc);
       ok = 0;
       break;
+    default:
+      GNUNET_assert (0);      
     }
 }
 
@@ -317,7 +317,8 @@ static void
 run (void *cls,
      struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
-     const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct CpsRunContext *crc;
 
@@ -328,7 +329,6 @@ run (void *cls,
   crc->cfg = cfg;
   crc->phase = RP_PUT;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -351,13 +351,12 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  pid = GNUNET_OS_start_process ("gnunet-service-datastore",
-                                 "gnunet-service-datastore",
+  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+                                 "gnunet-service-arm",
 #if VERBOSE
                                  "-L", "DEBUG",
 #endif
                                  "-c", "test_datastore_api_data.conf", NULL);
-  sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "perf-datastore-api", "nohelp",
                       options, &run, NULL);
@@ -376,10 +375,10 @@ main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-datastore");
   GNUNET_log_setup ("perf-datastore-api",
 #if VERBOSE
-                    "DEBUG",
+                   "DEBUG",
 #else
                     "WARNING",
 #endif
@@ -388,6 +387,7 @@ main (int argc, char *argv[])
 #if REPORT_ID
   fprintf (stderr, "\n");
 #endif
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-datastore");
   return ret;
 }