fixes

[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 660f256f9b327f7fe084116c12ace0675e951655..4d39d85ac4f29c0f0a520c59cc560683c62a7ed3 100644 (file)
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -81,6 +81,20 @@ struct CpsRunContext
 };
 
 
+/**
+ * Function called by plugins to notify us about a
+ * change in their disk utilization.
+ *
+ * @param cls closure (NULL)
+ * @param delta change in disk utilization, 
+ *        0 for "reset to empty"
+ */
+static void
+disk_utilization_change_cb (void *cls,
+                           int delta)
+{
+}
+
             
 static void
 putValue (struct GNUNET_DATASTORE_PluginFunctions * api, int i, int k)
@@ -331,10 +345,18 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg,
     }
   env.cfg = cfg;
   env.sched = sched;  
+  env.duc = &disk_utilization_change_cb;
+  env.cls = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Loading `%s' datastore plugin\n"), name);
   GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
-  GNUNET_assert (NULL != (ret = GNUNET_PLUGIN_load (libname, &env)));
+  if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
+    {
+      fprintf (stderr,
+              "Failed to load plugin `%s'!\n",
+              name);
+      return NULL;
+    }
   GNUNET_free (libname);
   GNUNET_free (name);
   return ret;
@@ -352,15 +374,19 @@ run (void *cls,
   struct CpsRunContext *crc;
 
   api = load_plugin (c, s);
-  GNUNET_assert (api != NULL);
+  if (api == NULL)
+    {
+      fprintf (stderr, 
+              "Could not initialize plugin, assuming database not configured. Test not run!\n");
+      return;
+    }
   crc = GNUNET_malloc(sizeof(struct CpsRunContext));
   crc->api = api;
   crc->sched = s;
   crc->cfg = c;
   crc->phase = RP_PUT;
-  GNUNET_SCHEDULER_add_after (s,
-                             GNUNET_SCHEDULER_NO_TASK,
-                             &test, crc);
+  GNUNET_SCHEDULER_add_now (crc->sched,
+                           &test, crc);
 }