2 files changed, 16 insertions, 3 deletions

diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 7f6b7fee0..54f1eb90c 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -67,7 +67,7 @@ enum RunPhase
 
 struct CpsRunContext
 {
-  int i;
+  unsigned int i;
   struct GNUNET_TIME_Absolute start;
   struct GNUNET_TIME_Absolute end;
   struct GNUNET_SCHEDULER_Handle *sched;
@@ -126,6 +126,10 @@ putValue (struct GNUNET_DATASTORE_PluginFunctions * api, int i, int k)
   stored_entries++;
 }
 
+static void
+test (void *cls,
+      const struct GNUNET_SCHEDULER_TaskContext *tc);
+
 
 static int
 iterateDummy (void *cls,
@@ -146,6 +150,7 @@ iterateDummy (void *cls,
     {
       crc->end = GNUNET_TIME_absolute_get();
       printf (crc->msg,
+              crc->i,
               (unsigned long long) (crc->end.value - crc->start.value));
       if (crc->phase != RP_AN_GET)
         {
@@ -158,6 +163,11 @@ iterateDummy (void *cls,
           else
             crc->phase = RP_PUT;
         }
+      GNUNET_SCHEDULER_add_after (crc->sched,
+                                  GNUNET_NO,
+                                  GNUNET_SCHEDULER_PRIORITY_KEEP,
+                                  GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+                                  &test, crc);
       return GNUNET_OK;
     }
   crc->api->next_request (next_cls,
@@ -165,6 +175,7 @@ iterateDummy (void *cls,
   return GNUNET_OK;
 }
 
+
 static void
 test (void *cls,
       const struct GNUNET_SCHEDULER_TaskContext *tc)
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index bcd5c7e2d..22e5df095 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -519,7 +519,7 @@ sqlite_next_request (void *next_cls,
 {
   static struct GNUNET_TIME_Absolute zero;
   struct NextContext * nc= next_cls;
-  struct Plugin *plugin = nc->plugin;
+  struct Plugin *plugin;
   unsigned long long rowid;
   sqlite3_stmt *stmtd;
   int ret;
@@ -531,6 +531,7 @@ sqlite_next_request (void *next_cls,
   const GNUNET_HashCode *key;
   const void *data;
 
+  plugin = nc->plugin;
   sqlite3_reset (nc->stmt);
   if ( (GNUNET_YES == end_it) ||
        (GNUNET_YES == nc->end_it) ||
@@ -784,7 +785,7 @@ iter_next_prepare (void *cls,
                    struct NextContext *nc)
 {
   struct IterContext *ic = cls;
-  struct Plugin *plugin = nc->plugin;
+  struct Plugin *plugin;
   int ret;
 
   if (nc == NULL)
@@ -793,6 +794,7 @@ iter_next_prepare (void *cls,
       sqlite3_finalize (ic->stmt_2);
       return GNUNET_SYSERR;
     }
+  plugin = nc->plugin;
   if (ic->is_prio)
     {
       sqlite3_bind_int (ic->stmt_1, 1, nc->lastPriority);