12 files changed, 340 insertions, 207 deletions

diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 1ad59099c..c3b8a9b15 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -43,6 +43,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_datastore_sqlite_la_SOURCES = \
   plugin_datastore_sqlite.c
 libgnunet_plugin_datastore_sqlite_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
 libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 968e09b20..3b9e22a3a 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -113,6 +113,32 @@ struct GNUNET_DATASTORE_Handle *GNUNET_DATASTORE_connect (struct
 
 
 /**
+ * Transmit DROP message to Database service.
+ */
+static size_t
+transmit_drop (void *cls,
+               size_t size, void *buf)
+{
+  struct GNUNET_DATASTORE_Handle *h = cls;
+  struct GNUNET_MessageHeader *hdr;
+
+  if (buf == NULL)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  _("Failed to transmit request to drop database.\n"));
+      GNUNET_DATASTORE_disconnect (h, GNUNET_NO);
+      return 0;
+    }
+  GNUNET_assert (size >= sizeof(struct GNUNET_MessageHeader));
+  hdr = buf;
+  hdr->size = htons(sizeof(struct GNUNET_MessageHeader));
+  hdr->type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_DROP));
+  GNUNET_DATASTORE_disconnect (h, GNUNET_NO);
+  return sizeof(struct GNUNET_MessageHeader);
+}
+
+
+/**
  * Disconnect from the datastore service (and free
  * associated resources).
  *
@@ -124,7 +150,14 @@ void GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
 {
   if (GNUNET_YES == drop)
     {
-      /* FIXME: send 'drop' request */
+      if (NULL != 
+          GNUNET_CLIENT_notify_transmit_ready (h->client,
+                                               sizeof(struct GNUNET_MessageHeader),
+                                               GNUNET_TIME_UNIT_MINUTES,
+                                               &transmit_drop,
+                                               h))
+        return;
+      GNUNET_break (0);
     }
   GNUNET_CLIENT_disconnect (h->client);
   GNUNET_free (h);
@@ -132,6 +165,45 @@ void GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
 
 
 /**
+ * The closure is followed by the data message.
+ */
+struct PutClosure
+{
+  struct GNUNET_DATASTORE_Handle *h;
+  GNUNET_DATASTORE_ContinuationWithStatus cont;
+  void *cont_cls;
+};
+
+
+/**
+ * Transmit PUT message to Database service.
+ */
+static size_t
+transmit_put (void *cls,
+              size_t size, void *buf)
+{
+  struct PutClosure *pc = cls;
+  struct DataMessage *dm;
+  uint16_t msize;
+
+  if (buf == NULL)
+    {
+      pc->cont (pc->cont_cls, GNUNET_SYSERR,
+                gettext_noop ("Error transmitting `PUT' message to datastore service.\n"));
+      GNUNET_free (pc);
+      return 0;
+    }
+  dm = (struct DataMessage*) &pc[1];
+  msize = ntohs(dm->size);
+  GNUNET_assert (msize <= size);
+  memcpy (buf, dm, msize);
+  /* FIXME: wait for response from datastore, then
+     call our continuation! */
+  return msize;
+}
+
+
+/**
  * Store an item in the datastore.  If the item is already present,
  * the priorities are summed up and the higher expiration time and
  * lower anonymity level is used.
@@ -144,6 +216,7 @@ void GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
  * @param priority priority of the content
  * @param anonymity anonymity-level for the content
  * @param expiration expiration time for the content
+ * @param timeout timeout for the operation
  * @param cont continuation to call when done
  * @param cont_cls closure for cont
  */
@@ -157,10 +230,41 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
                       uint32_t priority,
                       uint32_t anonymity,
                       struct GNUNET_TIME_Absolute expiration,
+                      struct GNUNET_TIME_Relative timeout,
                       GNUNET_DATASTORE_ContinuationWithStatus cont,
                       void *cont_cls)
 {
-  cont (cont_cls, GNUNET_SYSERR, "not implemented");
+  struct PutClosure *pc;
+  struct DataMessage *dm;
+
+  pc = GNUNET_malloc (sizeof(struct PutClosure) + 
+                      sizeof(struct DataMessage) + 
+                      size);
+  dm = (struct DataMessage*) &pc[1];
+  pc->h = h;
+  pc->cont = cont;
+  pc->cont_cls = cont_cls;
+  dm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_PUT);
+  dm->header.size = htons(sizeof(struct DataMessage) + size);
+  dm->rid = htonl(rid);
+  dm->size = htonl(size);
+  dm->type = htonl(type);
+  dm->priority = htonl(priority);
+  dm->anonymity = htonl(anonymity);
+  dm->uid = GNUNET_htonll(0);
+  dm->expiration = GNUNET_htonll(expiration);
+  dm->key = *key;
+  memcpy (&dm[1], data, size);
+  if (NULL == GNUNET_CLIENT_notify_transmit_ready (h->client,
+                                                   sizeof(struct DataMessage) + size,
+                                                   timeout,
+                                                   &transmit_put,
+                                                   pc))
+    {
+      GNUNET_break (0);
+      cont (cont_cls, GNUNET_SYSERR,
+            gettext_noop ("Not ready to transmit request to datastore service"));
+    }
 }
 
 
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 95ee18dad..f10f6d0f5 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -104,6 +104,9 @@ static unsigned long long stored_ops;
 
 static struct GNUNET_TIME_Absolute start_time;
 
+static int ok;
+
+
 static int
 putValue (int i, int k)
 {
@@ -206,7 +209,6 @@ run (void *cls,
 static int
 check ()
 {
-  int ok = 1 + 2 + 4 + 8;
   pid_t pid;
   char *const argv[] = { "perf-datastore-api",
     "-c",
@@ -228,7 +230,7 @@ check ()
   sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "perf-datastore-api", "nohelp",
-                      options, &run, &ok);
+                      options, &run, NULL);
   if (0 != PLIBC_KILL (pid, SIGTERM))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
diff --git a/src/datastore/perf_datastore_api_iterators.c b/src/datastore/perf_datastore_api_iterators.c
index 328cceb75..635fa1f28 100644
--- a/src/datastore/perf_datastore_api_iterators.c
+++ b/src/datastore/perf_datastore_api_iterators.c
@@ -52,6 +52,9 @@ static unsigned long long stored_ops;
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static struct GNUNET_SCHEDULER_Handle *sched;
+
+static int ok;
+
              
 static int
 putValue (struct GNUNET_DATASTORE_PluginFunctions * api, int i, int k)
@@ -271,7 +274,6 @@ run (void *cls,
 static int
 check ()
 {
-  int ok = 1 + 2 + 4 + 8;
   char *const argv[] = { "perf-datastore-api-iterators",
     "-c",
     "test_datastore_api_data.conf",
@@ -285,7 +287,7 @@ check ()
   };
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "perf-datastore-api-iterators", "nohelp",
-                      options, &run, &ok);
+                      options, &run, NULL);
   if (ok != 0)
     fprintf (stderr, "Missed some testcases: %u\n", ok);
   return ok;
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 5ae03b9bb..6abb08dd8 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -1,4 +1,4 @@
-/*
+ /*
      This file is part of GNUnet
      (C) 2009 Christian Grothoff (and other contributing authors)
 
@@ -63,11 +63,11 @@
   "ORDER BY prio ASC, hash ASC LIMIT 1"
 
 #define SELECT_IT_NON_ANONYMOUS_1 \
-  "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (prio = ? AND hash < ? AND anonLevel = 0) "\
+  "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (prio = ? AND hash < ? AND anonLevel = 0 AND expire > %llu) "\
   " ORDER BY hash DESC LIMIT 1"
 
 #define SELECT_IT_NON_ANONYMOUS_2 \
-  "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (prio < ? AND anonLevel = 0)"\
+  "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (prio < ? AND anonLevel = 0 AND expire > %llu)"\
   " ORDER BY prio DESC, hash DESC LIMIT 1"
 
 #define SELECT_IT_EXPIRATION_TIME_1 \
@@ -83,7 +83,7 @@
   " ORDER BY hash DESC LIMIT 1"
 
 #define SELECT_IT_MIGRATION_ORDER_2 \
-  "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (expire < ?) "\
+  "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (expire < ? AND expire > %llu) "\
   " ORDER BY expire DESC, hash DESC LIMIT 1"
 
 /**
@@ -220,7 +220,6 @@ database_setup (struct GNUNET_CONFIGURATION_Handle *cfg,
                 struct Plugin *plugin)
 {
   sqlite3_stmt *stmt;
-  char *dir;
   char *afsdir;
 #if ENULL_DEFINED
   char *e;
@@ -228,33 +227,31 @@ database_setup (struct GNUNET_CONFIGURATION_Handle *cfg,
   
   if (GNUNET_OK != 
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "FS",
-                                               "DIR",
+                                               "datastore-sqlite",
+                                               "FILENAME",
                                                &afsdir))
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
                        "sqlite",
                        _("Option `%s' in section `%s' missing in configuration!\n"),
-                       "DIR",
-                       "FS");
+                       "FILENAME",
+                       "datastore-sqlite");
       return GNUNET_SYSERR;
     }
-  GNUNET_asprintf (&dir, "%s/content/gnunet.dat", afsdir);
-  GNUNET_free (afsdir);
-  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (dir))
+  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (afsdir))
     {
       GNUNET_break (0);
-      GNUNET_free (dir);
+      GNUNET_free (afsdir);
       return GNUNET_SYSERR;
     }
-  plugin->fn = GNUNET_STRINGS_to_utf8 (dir, strlen (dir),
+  plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir),
 #ifdef ENABLE_NLS
                                               nl_langinfo (CODESET)
 #else
                                               "UTF-8"   /* good luck */
 #endif
                                               );
-  GNUNET_free (dir);
+  GNUNET_free (afsdir);
   
   /* Open database and precompile statements */
   if (sqlite3_open (plugin->fn, &plugin->dbh) != SQLITE_OK)
@@ -794,7 +791,7 @@ iter_next_prepare (void *cls,
 {
   struct IterContext *ic = cls;
   struct Plugin *plugin = nc->plugin;
-  struct GNUNET_TIME_Absolute now;
+  int ret;
 
   if (nc == NULL)
     {
@@ -802,7 +799,6 @@ iter_next_prepare (void *cls,
       sqlite3_finalize (ic->stmt_2);
       return GNUNET_SYSERR;
     }
-  now = GNUNET_TIME_absolute_get ();
   if (ic->is_prio)
     {
       sqlite3_bind_int (ic->stmt_1, 1, nc->lastPriority);
@@ -817,13 +813,7 @@ iter_next_prepare (void *cls,
                      &ic->key, 
                      sizeof (GNUNET_HashCode),
                      SQLITE_TRANSIENT);
-  datum_1 = NULL;
-  datum_2 = last_datum_2;
-  last_datum_2 = NULL;
-
-  if ( (SQLITE_ROW == (ret = sqlite3_step (stmt_1))) &&
-       ( (GNUNET_NO == ic->is_migr) || 
-         (sqlite3_column_int64 (stmt_1, 4) >= now.value) ) )
+  if (SQLITE_ROW == (ret = sqlite3_step (ic->stmt_1)))
     {
       nc->stmt = ic->stmt_1;
       return GNUNET_OK;
@@ -836,117 +826,30 @@ iter_next_prepare (void *cls,
                   "sqlite3_step");
       return GNUNET_SYSERR;
     }
-  if (SQLITE_OK != sqlite3_reset (stmt_1))
-    LOG_SQLITE (handle, NULL,
+  if (SQLITE_OK != sqlite3_reset (ic->stmt_1))
+    LOG_SQLITE (plugin, NULL,
                 GNUNET_ERROR_TYPE_ERROR | 
                 GNUNET_ERROR_TYPE_BULK, 
                 "sqlite3_reset");
-  
-  if (datum_2 == NULL)
-    {
-      if ( (SQLITE_ROW == (ret = sqlite3_step (ic->stmt_2))) && 
-           ( (GNUNET_NO == ic->is_migr) ||
-             sqlite3_column_int64 (stmt_2, 4) >= now.value) )
-        {
-          nc->stmt = ic->stmt_2;
-          return GNUNET_OK;
-        }
-      if (ret != SQLITE_DONE)
-        {
-          LOG_SQLITE (plugin, NULL,
-                      GNUNET_ERROR_TYPE_ERROR |
-                      GNUNET_ERROR_TYPE_BULK,
-                      "sqlite3_step");
-          return GNUNET_SYSERR;
-        }
-      if (SQLITE_OK != sqlite3_reset (stmt_2))
-        LOG_SQLITE (plugin, NULL,
-                    GNUNET_ERROR_TYPE_ERROR |
-                    GNUNET_ERROR_TYPE_BULK,
-                    "sqlite3_reset");
-    }
-  datum = NULL;
-  if (datum_1 == NULL)
-    {
-      datum = datum_2;
-      rowid = rowid_2;
-      key = key_2;
-    }
-  else if (datum_2 == NULL)
+  if (SQLITE_ROW == (ret = sqlite3_step (ic->stmt_2))) 
     {
-      datum = datum_1;
-      rowid = rowid_1;
-      key = key_1;
-    }
-  else
-    {
-      /* have to pick between 1 and 2 */
-      if (is_prio)
-        {
-          if ((ntohl (datum_1->priority) < ntohl (datum_2->priority)) ==
-              is_asc)
-            {
-              datum = datum_1;
-              rowid = rowid_1;
-              key = key_1;
-              last_datum_2 = datum_2;
-            }
-          else
-            {
-              datum = datum_2;
-              rowid = rowid_2;
-              key = key_2;
-              GNUNET_free (datum_1);
-            }
-        }
-      else
-        {
-          if ((GNUNET_ntohll (datum_1->expiration_time) <
-               GNUNET_ntohll (datum_2->expiration_time)) == is_asc)
-            {
-              datum = datum_1;
-              rowid = rowid_1;
-              key = key_1;
-              last_datum_2 = datum_2;
-            }
-          else
-            {
-              datum = datum_2;
-              rowid = rowid_2;
-              key = key_2;
-              GNUNET_free (datum_1);
-            }
-        }
+      nc->stmt = ic->stmt_2;
+      return GNUNET_OK;
     }
-  if (datum == NULL)
-    break;
-#if 0
-  printf ("FOUND %4u prio %4u exp %20llu old: %4u, %20llu\n",
-          (ntohl (datum->size) - sizeof (GNUNET_DatastoreValue)),
-          ntohl (datum->priority),
-          GNUNET_ntohll (datum->expiration_time), lastPrio, lastExp);
-#endif
-  if (((GNUNET_NO == limit_nonanonymous) ||
-       (ntohl (datum->anonymity_level) == 0)) &&
-      ((type == GNUNET_ECRS_BLOCKTYPE_ANY) ||
-       (type == ntohl (datum->type))))
+  if (ret != SQLITE_DONE)
     {
-      count++;
-      if (iter != NULL)
-        {
-          ret = iter (&key, datum, closure, rowid);
-          if (ret == GNUNET_SYSERR)
-            {
-              GNUNET_free (datum);
-              break;
-            }
-          if (ret == GNUNET_NO)
-            {
-              payload -= getContentDatastoreSize (datum);
-              delete_by_rowid (handle, rowid);
-            }
-        }
+      LOG_SQLITE (plugin, NULL,
+                  GNUNET_ERROR_TYPE_ERROR |
+                  GNUNET_ERROR_TYPE_BULK,
+                  "sqlite3_step");
+      return GNUNET_SYSERR;
     }
+  if (SQLITE_OK != sqlite3_reset (ic->stmt_2))
+    LOG_SQLITE (plugin, NULL,
+                GNUNET_ERROR_TYPE_ERROR |
+                GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_reset");
+  return GNUNET_NO;
 }
 
 
@@ -1070,8 +973,13 @@ sqlite_plugin_iter_zero_anonymity (void *cls,
                                    PluginIterator iter,
                                    void *iter_cls)
 {
-  static struct GNUNET_TIME_Absolute zero;
-  iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, zero, 0);
+  basic_iter (cls,
+              type, 
+              GNUNET_NO, GNUNET_YES, 
+              GNUNET_NO, GNUNET_YES,
+              SELECT_IT_NON_ANONYMOUS_1,
+              SELECT_IT_NON_ANONYMOUS_2, 
+              iter, iter_cls);
 }
 
 
@@ -1092,10 +1000,24 @@ sqlite_plugin_iter_ascending_expiration (void *cls,
                                          PluginIterator iter,
                                          void *iter_cls)
 {
-  static struct GNUNET_TIME_Absolute zero;
-  iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, zero, 0);
-}
+  struct GNUNET_TIME_Absolute now;
+  char *q1;
+  char *q2;
 
+  now = GNUNET_TIME_absolute_get ();
+  GNUNET_asprintf (&q1, SELECT_IT_EXPIRATION_TIME_1,
+                   now.value);
+  GNUNET_asprintf (&q2, SELECT_IT_EXPIRATION_TIME_2,
+                   now.value);
+  basic_iter (cls,
+              type, 
+              GNUNET_YES, GNUNET_NO, 
+              GNUNET_NO, GNUNET_NO,
+              q1, q2,
+              iter, iter_cls);
+  GNUNET_free (q1);
+  GNUNET_free (q2);
+}
 
 
 /**
@@ -1114,8 +1036,20 @@ sqlite_plugin_iter_migration_order (void *cls,
                                     PluginIterator iter,
                                     void *iter_cls)
 {
-  static struct GNUNET_TIME_Absolute zero;
-  iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, zero, 0);
+  struct GNUNET_TIME_Absolute now;
+  char *q;
+
+  now = GNUNET_TIME_absolute_get ();
+  GNUNET_asprintf (&q, SELECT_IT_MIGRATION_ORDER_2,
+                   now.value);
+  basic_iter (cls,
+              type, 
+              GNUNET_NO, GNUNET_NO, 
+              GNUNET_YES, GNUNET_NO,
+              SELECT_IT_MIGRATION_ORDER_1,
+              q,
+              iter, iter_cls);
+  GNUNET_free (q);
 }
 
 
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 0b08cfe8f..b4da05fda 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -37,6 +37,8 @@ static struct GNUNET_DATASTORE_Handle *datastore;
 
 static struct GNUNET_TIME_Absolute now;
 
+static int ok;
+
 
 static size_t
 get_size (int i)
@@ -84,13 +86,47 @@ get_expiration (int i)
   return av;
 }
 
+enum RunPhase
+  {
+    RP_DONE = 0,
+    RP_PUT,
+    RP_GET,
+    RP_DEL,
+    RP_DELVALIDATE
+  };
+
+
+struct CpsRunContext
+{
+  GNUNET_HashCode key;
+  int i;
+  int *iptr;
+  struct GNUNET_SCHEDULER_Handle *sched;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  enum RunPhase phase;
+};
+
+
+static void
+run_continuation (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc);
+
 
 static void
 check_success (void *cls,
                int success,
                const char *msg)
 {
+  struct CpsRunContext *crc = cls;
+  if (GNUNET_OK != success)
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "%s\n", msg);
   GNUNET_assert (GNUNET_OK == success);
+  GNUNET_SCHEDULER_add_continuation (crc->sched,
+                                     GNUNET_NO,
+                                     &run_continuation,
+                                     crc,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
@@ -99,8 +135,14 @@ check_failure (void *cls,
                int success,
                const char *msg)
 {
+  struct CpsRunContext *crc = cls;
   GNUNET_assert (GNUNET_OK != success);
   GNUNET_assert (NULL != msg);
+  GNUNET_SCHEDULER_add_continuation (crc->sched,
+                                     GNUNET_NO,
+                                     &run_continuation,
+                                     crc,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
@@ -115,18 +157,23 @@ check_value (void *cls,
              struct GNUNET_TIME_Absolute
              expiration, uint64_t uid)
 {
-  int *iptr = cls;
+  struct CpsRunContext *crc = cls;
   int i;
 
   if (key == NULL)
     return;
-  i = *iptr;
+  i = crc->i;
   GNUNET_assert (size == get_size (i));
   GNUNET_assert (0 == memcmp (data, get_data(i), size));
   GNUNET_assert (type == get_type (i));
   GNUNET_assert (priority == get_priority (i));
   GNUNET_assert (anonymity == get_anonymity(i));
   GNUNET_assert (expiration.value == get_expiration(i).value);
+  GNUNET_SCHEDULER_add_continuation (crc->sched,
+                                     GNUNET_NO,
+                                     &run_continuation,
+                                     crc,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
@@ -141,6 +188,7 @@ delete_value (void *cls,
              struct GNUNET_TIME_Absolute
              expiration, uint64_t uid)
 {
+  struct CpsRunContext *crc = cls;
   if (key == NULL)
     return;
   GNUNET_DATASTORE_remove (datastore,
@@ -156,6 +204,11 @@ delete_value (void *cls,
                            data,
                            &check_failure,
                            NULL);
+  GNUNET_SCHEDULER_add_continuation (crc->sched,
+                                     GNUNET_NO,
+                                     &run_continuation,
+                                     crc,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
@@ -171,78 +224,112 @@ check_nothing (void *cls,
              struct GNUNET_TIME_Absolute
              expiration, uint64_t uid)
 {
+  struct CpsRunContext *crc = cls;
   GNUNET_assert (key == NULL);
+  GNUNET_SCHEDULER_add_continuation (crc->sched,
+                                     GNUNET_NO,
+                                     &run_continuation,
+                                     crc,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
-
 static void
-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
-     char *const *args,
-     const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+run_continuation (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_HashCode key;
-  int i;
-  int *iptr;
-
-  datastore = GNUNET_DATASTORE_connect (cfg, sched);
-  now.value = 1000000;
-  for (i = 0; i < 256; i++)
+  struct CpsRunContext *crc = cls;
+  ok = (int) crc->phase;
+  switch (crc->phase)
     {
-      memset (&key, 256 - i, sizeof (GNUNET_HashCode));
+    case RP_PUT:
+      memset (&crc->key, 256 - crc->i, sizeof (GNUNET_HashCode));
       GNUNET_DATASTORE_put (datastore,
                             0,
-                            &key,
-                            get_size (i),
-                            get_data (i),
-                            get_type (i),
-                            get_priority (i),
-                            get_anonymity (i),
-                            get_expiration (i),
+                            &crc->key,
+                            get_size (crc->i),
+                            get_data (crc->i),
+                            get_type (crc->i),
+                            get_priority (crc->i),
+                            get_anonymity (crc->i),
+                            get_expiration (crc->i),
                             &check_success,
-                            NULL);
-    }
-  for (i = 255; i >= 0; i--)
-    {
-      memset (&key, 256 - i, sizeof (GNUNET_HashCode));
-      iptr = GNUNET_malloc(sizeof(int));
-      *iptr = i;
+                            crc);
+      crc->i++;
+      if (crc->i == 256)
+        crc->phase = RP_GET;
+      break;
+    case RP_GET:
+      crc->i--;
+      memset (&crc->key, 256 - crc->i, sizeof (GNUNET_HashCode));
       GNUNET_DATASTORE_get (datastore, 
-                            &key,
-                            get_type (i),
+                            &crc->key,
+                            get_type (crc->i),
                             &check_value,
-                            iptr);
-    }
-  for (i = 255; i >= 0; i--)
-    {
-      memset (&key, 256 - i, sizeof (GNUNET_HashCode));
-      iptr = GNUNET_malloc(sizeof(int));
-      *iptr = i;
+                            crc);
+      if (crc->i == 0)
+        {
+          crc->phase = RP_DEL;
+          crc->i = 256;
+        }
+      break;
+    case RP_DEL:
+      crc->i--;
+      memset (&crc->key, 256 - crc->i, sizeof (GNUNET_HashCode));
       GNUNET_DATASTORE_get (datastore, 
-                            &key,
-                            get_type (i),
+                            &crc->key,
+                            get_type (crc->i),
                             &delete_value,
-                            iptr);
-    }
-  for (i = 255; i >= 0; i--)
-    {
-      memset (&key, 256 - i, sizeof (GNUNET_HashCode));
-      iptr = GNUNET_malloc(sizeof(int));
-      *iptr = i;
+                            crc);
+      if (crc->i == 0)
+        {
+          crc->phase = RP_DELVALIDATE;
+          crc->i = 256;  
+        }
+      break;
+    case RP_DELVALIDATE:
+      crc->i--;
+      memset (&crc->key, 256 - crc->i, sizeof (GNUNET_HashCode));
       GNUNET_DATASTORE_get (datastore, 
-                            &key,
-                            get_type (i),
+                            &crc->key,
+                            get_type (crc->i),
                             &check_nothing,
-                            iptr);
-    }
+                            crc);
+      if (crc->i == 0)
+        {
+          crc->phase = RP_DONE;   
+        }
+      break;
   /* check reservations */
-
   /* check update */
-
   /* test multiple results */
+    case RP_DONE:
+      GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+      ok = 0;
+    }
+}
+
+
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *sched,
+     char *const *args,
+     const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct CpsRunContext *crc;
+
+  crc = GNUNET_malloc(sizeof(struct CpsRunContext));
+  crc->sched = sched;
+  crc->cfg = cfg;
+  crc->phase = RP_PUT;
+  now.value = 1000000;
+  datastore = GNUNET_DATASTORE_connect (cfg, sched);
+  GNUNET_SCHEDULER_add_continuation (crc->sched,
+                                     GNUNET_NO,
+                                     &run_continuation,
+                                     crc,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 
-  GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
 }
 
 
@@ -250,7 +337,6 @@ run (void *cls,
 static int
 check ()
 {
-  int ok = 1 + 2 + 4 + 8;
   pid_t pid;
   char *const argv[] = { "test-datastore-api",
     "-c",
@@ -272,7 +358,7 @@ check ()
   sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "test-datastore-api", "nohelp",
-                      options, &run, &ok);
+                      options, &run, NULL);
   if (0 != PLIBC_KILL (pid, SIGTERM))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 10b2157d3..2dcc153e6 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -122,6 +122,7 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
  * @param priority priority of the content
  * @param anonymity anonymity-level for the content
  * @param expiration expiration time for the content
+ * @param timeout timeout for the operation
  * @param cont continuation to call when done
  * @param cont_cls closure for cont
  */
@@ -135,6 +136,7 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
                       uint32_t priority,
                       uint32_t anonymity,
                       struct GNUNET_TIME_Absolute expiration,
+                      struct GNUNET_TIME_Relative timeout,
                       GNUNET_DATASTORE_ContinuationWithStatus cont,
                       void *cont_cls);
 
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 792f777ed..629e355ad 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1683,7 +1683,7 @@ libgnunet_plugin_transport_tcp_init (void *cls)
   unsigned long long aport;
   unsigned long long bport;
 
-  service = GNUNET_SERVICE_start ("tcp", env->sched, env->cfg);
+  service = GNUNET_SERVICE_start ("transport-tcp", env->sched, env->cfg);
   if (service == NULL)
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
@@ -1696,13 +1696,13 @@ libgnunet_plugin_transport_tcp_init (void *cls)
   aport = 0;
   if ((GNUNET_OK !=
        GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                              "tcp",
+                                              "transport-tcp",
                                               "PORT",
                                               &bport)) ||
       (bport > 65535) ||
       ((GNUNET_OK ==
         GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                               "tcp",
+                                               "transport-tcp",
                                                "ADVERTISED-PORT",
                                                &aport)) && (aport > 65535)))
     {
@@ -1710,7 +1710,7 @@ libgnunet_plugin_transport_tcp_init (void *cls)
                        "tcp",
                        _
                        ("Require valid port number for service `%s' in configuration!\n"),
-                       "tcp");
+                       "transport-tcp");
       GNUNET_SERVICE_stop (service);
       return NULL;
     }
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index 0fa611350..518f0d09d 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -14,7 +14,7 @@ PORT = 2366
 [statistics]
 PORT = 2367
 
-[tcp]
+[transport-tcp]
 PORT = 2368
 
 [peerinfo]
diff --git a/src/transport/test_transport_api_peer1.conf b/src/transport/test_transport_api_peer1.conf
index dcc0ab4cf..46d7ceec9 100644
--- a/src/transport/test_transport_api_peer1.conf
+++ b/src/transport/test_transport_api_peer1.conf
@@ -15,7 +15,7 @@ PORT = 12366
 [statistics]
 PORT = 12367
 
-[tcp]
+[transport-tcp]
 PORT = 12368
 
 [peerinfo]
diff --git a/src/transport/test_transport_api_peer2.conf b/src/transport/test_transport_api_peer2.conf
index 8567c6ac8..f980fbe1b 100644
--- a/src/transport/test_transport_api_peer2.conf
+++ b/src/transport/test_transport_api_peer2.conf
@@ -15,7 +15,7 @@ PORT = 22366
 [statistics]
 PORT = 22367
 
-[tcp]
+[transport-tcp]
 PORT = 22368
 
 [peerinfo]
diff --git a/src/util/disk.c b/src/util/disk.c
index df6e5df8a..a7e4a0865 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -981,16 +981,19 @@ GNUNET_DISK_file_open (const char *fn, int flags, ...)
   char *expfn;
   struct GNUNET_IO_Handle *ret;
 #ifdef MINGW
-  DWORD access, disp;
+  DWORD access;
+  DWORD disp;
   HANDLE h;
 #else
-  int oflags, mode;
+  int oflags;
+  int mode;
   int fd;
 #endif
 
   expfn = GNUNET_STRINGS_filename_expand (fn);
 
 #ifndef MINGW
+  mode = 0;
   oflags = 0;
   if (GNUNET_DISK_OPEN_READWRITE == (flags & GNUNET_DISK_OPEN_READWRITE))
     oflags = O_RDWR; /* note: O_RDWR is NOT always O_RDONLY | O_WRONLY */
@@ -1020,7 +1023,6 @@ GNUNET_DISK_file_open (const char *fn, int flags, ...)
       perm = va_arg (arg, int);
       va_end (arg);
 
-      mode = 0;
       if (perm & GNUNET_DISK_PERM_USER_READ)
         mode |= S_IRUSR;
       if (perm & GNUNET_DISK_PERM_USER_WRITE)