fixing reconnect issues
[oweals/gnunet.git] / src / datastore / perf_plugin_datastore.c
index 54f1eb90ce6a0c4ddd711b7a4f63231fd7add40c..ea1df5efa12dedc61461dadc874f8132948fb005 100644 (file)
@@ -28,7 +28,7 @@
 #include "gnunet_protocols.h"
 #include "plugin_datastore.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * Target datastore size (in bytes).  Realistic sizes are
@@ -71,10 +71,11 @@ struct CpsRunContext
   struct GNUNET_TIME_Absolute start;
   struct GNUNET_TIME_Absolute end;
   struct GNUNET_SCHEDULER_Handle *sched;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_DATASTORE_PluginFunctions * api;
   const char *msg;
   enum RunPhase phase;
+  unsigned int cnt;
 };
 
 
@@ -87,6 +88,7 @@ putValue (struct GNUNET_DATASTORE_PluginFunctions * api, int i, int k)
   static GNUNET_HashCode key;
   static int ic;
   char *msg;
+  unsigned int prio;
 
   /* most content is 32k */
   size = 32 * 1024;
@@ -103,12 +105,13 @@ putValue (struct GNUNET_DATASTORE_PluginFunctions * api, int i, int k)
     memset (value, i - 255, size / 2);
   value[0] = k;
   msg = NULL;
+  prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
   if (GNUNET_OK != api->put (api->cls,
                             &key, 
                             size,
                             value,
                             i,
-                            GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100),
+                            prio,
                             i,
                             GNUNET_TIME_relative_to_absolute 
                             (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
@@ -137,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
@@ -151,7 +154,8 @@ iterateDummy (void *cls,
       crc->end = GNUNET_TIME_absolute_get();
       printf (crc->msg,
              crc->i,
-             (unsigned long long) (crc->end.value - crc->start.value));
+             (unsigned long long) (crc->end.value - crc->start.value),
+             crc->cnt);
       if (crc->phase != RP_AN_GET)
        {
          crc->phase++;
@@ -164,18 +168,69 @@ iterateDummy (void *cls,
            crc->phase = RP_PUT;
        }
       GNUNET_SCHEDULER_add_after (crc->sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                 GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+                                 GNUNET_SCHEDULER_NO_TASK,
                                  &test, crc);
       return GNUNET_OK;
     }
+#if VERBOSE
+  fprintf (stderr, "Found result type=%u, priority=%u, size=%u, expire=%llu\n",
+          type, priority, size,
+          (unsigned long long) expiration.value);
+#endif
+  crc->cnt++;
   crc->api->next_request (next_cls,
                          GNUNET_NO);
   return GNUNET_OK;
 }
 
 
+
+/**
+ * Function called when the service shuts
+ * down.  Unloads our datastore plugin.
+ *
+ * @param api api to unload
+ * @param cfg configuration to use
+ */
+static void
+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);
+}
+
+
+
+/**
+ * Last task run during shutdown.  Disconnects us from
+ * the transport and core.
+ */
+static void
+cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct CpsRunContext *crc = cls;
+
+  unload_plugin (crc->api, crc->cfg);
+  GNUNET_free (crc);
+}
+
+
 static void
 test (void *cls,
       const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -190,53 +245,61 @@ test (void *cls,
       for (j=0;j<PUT_10;j++)
        putValue (crc->api, j, crc->i);
       crc->end = GNUNET_TIME_absolute_get ();
-      printf ("%3u insertion              took %20llums\n", crc->i,
-             (unsigned long long) (crc->end.value - crc->start.value));
+      printf ("%3u insertion took                      %20llums for %u\n",
+             crc->i,
+             (unsigned long long) (crc->end.value - crc->start.value),
+             (unsigned int) PUT_10);
       crc->i++;
       crc->phase = RP_LP_GET;
       GNUNET_SCHEDULER_add_after (crc->sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                 GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+                                 GNUNET_SCHEDULER_NO_TASK,
                                  &test, crc);
       break;
     case RP_LP_GET:
+      crc->cnt = 0;
       crc->start = GNUNET_TIME_absolute_get ();      
-      crc->msg = "%3u low priority iteration took %20llums\n";
+      crc->msg = "%3u low priority iteration took         %20llums for %u\n";
       crc->api->iter_low_priority (crc->api->cls, 0, 
                                   &iterateDummy,
                                   crc);
       break;
     case RP_AE_GET:
+      crc->cnt = 0;
       crc->start = GNUNET_TIME_absolute_get ();      
-      crc->msg = "%3u ascending expiration iteration took %20llums\n";
+      crc->msg = "%3u ascending expiration iteration took %20llums for %u\n";
       crc->api->iter_ascending_expiration (crc->api->cls, 0, 
                                      &iterateDummy,
                                      crc);
       break;
     case RP_ZA_GET:
+      crc->cnt = 0;
       crc->start = GNUNET_TIME_absolute_get ();      
-      crc->msg = "%3u zero anonymity iteration took %20llums\n";
+      crc->msg = "%3u zero anonymity iteration took       %20llums for %u\n";
       crc->api->iter_zero_anonymity (crc->api->cls, 0, 
                                     &iterateDummy,
                                     crc);
       break;
     case RP_MO_GET:
+      crc->cnt = 0;
       crc->start = GNUNET_TIME_absolute_get ();      
-      crc->msg = "%3u migration order iteration took %20llums\n";
+      crc->msg = "%3u migration order iteration took      %20llums for %u\n";
       crc->api->iter_migration_order (crc->api->cls, 0, 
                                      &iterateDummy,
                                      crc);
       break;
     case RP_AN_GET:
+      crc->cnt = 0;
       crc->start = GNUNET_TIME_absolute_get ();      
-      crc->msg = "%3u all now iteration took %20llums\n";
+      crc->msg = "%3u all now iteration took              %20llums for %u\n";
       crc->api->iter_all_now (crc->api->cls, 0,
                              &iterateDummy,
                              crc);
       break;
     case RP_DONE:
       crc->api->drop (crc->api->cls);
+      GNUNET_SCHEDULER_add_with_priority (crc->sched,
+                                   GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                   &cleaning_task, crc);
       break;
     }
 }
@@ -246,7 +309,7 @@ test (void *cls,
  * Load the datastore plugin.
  */
 static struct GNUNET_DATASTORE_PluginFunctions *
-load_plugin (struct GNUNET_CONFIGURATION_Handle *cfg,
+load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg,
             struct GNUNET_SCHEDULER_Handle *sched)
 {
   static struct GNUNET_DATASTORE_PluginEnvironment env;
@@ -276,58 +339,12 @@ load_plugin (struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 
-/**
- * Function called when the service shuts
- * down.  Unloads our datastore plugin.
- *
- * @param api api to unload
- */
-static void
-unload_plugin (struct GNUNET_DATASTORE_PluginFunctions * api,
-              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);
-}
-
-
-
-/**
- * Last task run during shutdown.  Disconnects us from
- * the transport and core.
- */
-static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct CpsRunContext *crc = cls;
-
-  unload_plugin (crc->api, crc->cfg);
-  GNUNET_free (crc);
-}
-
-
-
 static void
 run (void *cls,
      struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
-     struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   struct GNUNET_DATASTORE_PluginFunctions *api;
   struct CpsRunContext *crc;
@@ -340,16 +357,8 @@ run (void *cls,
   crc->cfg = c;
   crc->phase = RP_PUT;
   GNUNET_SCHEDULER_add_after (s,
-                             GNUNET_YES,
-                             GNUNET_SCHEDULER_PRIORITY_KEEP,
-                             GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+                             GNUNET_SCHEDULER_NO_TASK,
                              &test, crc);
-  GNUNET_SCHEDULER_add_delayed (s,
-                                GNUNET_YES,
-                                GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleaning_task, crc);
 }
 
 
@@ -382,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",
@@ -390,6 +400,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/perf-gnunet-datastore");
 
   return ret;
 }