X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdatastore%2Fdatastore_api.c;h=3bf8ecd94f26cbee17fc407b21110d034d858bdf;hb=6c471eeb15e27f8226492b4860a3c2acb94c5f25;hp=85e402a4d9468a30bee381c88e56295bc756a2f1;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 85e402a4d..3bf8ecd94 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -31,10 +31,12 @@
 #include "gnunet_statistics_service.h"
 #include "datastore.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "datastore-api",__VA_ARGS__)
+
 /**
  * If a client stopped asking for more results, how many more do
  * we receive from the DB before killing the connection?  Trade-off
- * between re-doing TCP handshakes and (needlessly) receiving 
+ * between re-doing TCP handshakes and (needlessly) receiving
  * useless results.
  */
 #define MAX_EXCESS_RESULTS 8
@@ -163,7 +165,7 @@ struct GNUNET_DATASTORE_QueueEntry
   /**
    * Has this message been transmitted to the service?
    * Only ever GNUNET_YES for the head of the queue.
-   * Note that the overall struct should end at a 
+   * Note that the overall struct should end at a
    * multiple of 64 bits.
    */
   int was_transmitted;
@@ -171,7 +173,7 @@ struct GNUNET_DATASTORE_QueueEntry
 };
 
 /**
- * Handle to the datastore service. 
+ * Handle to the datastore service.
  */
 struct GNUNET_DATASTORE_Handle
 {
@@ -267,6 +269,22 @@ GNUNET_DATASTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 }
 
 
+/**
+ * Task used by 'transmit_drop' to disconnect the datastore.
+ *
+ * @param cls the datastore handle
+ * @param tc scheduler context
+ */
+static void
+disconnect_after_drop (void *cls,
+		       const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GNUNET_DATASTORE_Handle *h = cls;
+
+  GNUNET_DATASTORE_disconnect (h, GNUNET_NO);
+}
+
+
 /**
  * Transmit DROP message to datastore service.
  *
@@ -283,16 +301,18 @@ transmit_drop (void *cls, size_t size, void *buf)
 
   if (buf == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to transmit request to drop database.\n"));
-    GNUNET_DATASTORE_disconnect (h, GNUNET_NO);
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         _("Failed to transmit request to drop database.\n"));
+    GNUNET_SCHEDULER_add_continuation (&disconnect_after_drop, h,
+				       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
     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);
+  GNUNET_SCHEDULER_add_continuation (&disconnect_after_drop, h,
+				     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
   return sizeof (struct GNUNET_MessageHeader);
 }
 
@@ -309,9 +329,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop)
 {
   struct GNUNET_DATASTORE_QueueEntry *qe;
 
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Datastore disconnect\n");
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Datastore disconnect\n");
   if (NULL != h->th)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
@@ -319,7 +337,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop)
   }
   if (h->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
@@ -344,7 +362,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop)
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_YES, &transmit_drop, h))
         return;
-      GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (h->client);
       h->client = NULL;
     }
     GNUNET_break (0);
@@ -367,14 +385,11 @@ timeout_queue_entry (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_DATASTORE_QueueEntry *qe = cls;
 
   GNUNET_STATISTICS_update (qe->h->stats,
-                            gettext_noop ("# queue entry timeouts"),
-                            1, GNUNET_NO);
+                            gettext_noop ("# queue entry timeouts"), 1,
+                            GNUNET_NO);
   qe->task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_assert (qe->was_transmitted == GNUNET_NO);
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Timeout of request in datastore queue\n");
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Timeout of request in datastore queue\n");
   qe->response_proc (qe->h, NULL);
 }
 
@@ -391,13 +406,11 @@ timeout_queue_entry (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param timeout timeout for the operation
  * @param response_proc function to call with replies (can be NULL)
  * @param qc client context (NOT a closure for response_proc)
- * @return NULL if the queue is full 
+ * @return NULL if the queue is full
  */
 static struct GNUNET_DATASTORE_QueueEntry *
-make_queue_entry (struct GNUNET_DATASTORE_Handle *h,
-                  size_t msize,
-                  unsigned int queue_priority,
-                  unsigned int max_queue_size,
+make_queue_entry (struct GNUNET_DATASTORE_Handle *h, size_t msize,
+                  unsigned int queue_priority, unsigned int max_queue_size,
                   struct GNUNET_TIME_Relative timeout,
                   GNUNET_CLIENT_MessageHandler response_proc,
                   const union QueueContext *qc)
@@ -408,16 +421,16 @@ make_queue_entry (struct GNUNET_DATASTORE_Handle *h,
 
   c = 0;
   pos = h->queue_head;
-  while ((pos != NULL) &&
-         (c < max_queue_size) && (pos->priority >= queue_priority))
+  while ((pos != NULL) && (c < max_queue_size) &&
+         (pos->priority >= queue_priority))
   {
     c++;
     pos = pos->next;
   }
   if (c >= max_queue_size)
   {
-    GNUNET_STATISTICS_update (h->stats,
-                              gettext_noop ("# queue overflows"), 1, GNUNET_NO);
+    GNUNET_STATISTICS_update (h->stats, gettext_noop ("# queue overflows"), 1,
+                              GNUNET_NO);
     return NULL;
   }
   ret = GNUNET_malloc (sizeof (struct GNUNET_DATASTORE_QueueEntry) + msize);
@@ -443,8 +456,7 @@ make_queue_entry (struct GNUNET_DATASTORE_Handle *h,
       pos = h->queue_head;
   }
   c++;
-  GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# queue entries created"),
+  GNUNET_STATISTICS_update (h->stats, gettext_noop ("# queue entries created"),
                             1, GNUNET_NO);
   GNUNET_CONTAINER_DLL_insert_after (h->queue_head, h->queue_tail, pos, ret);
   h->queue_size++;
@@ -455,12 +467,9 @@ make_queue_entry (struct GNUNET_DATASTORE_Handle *h,
     if ((pos->max_queue < h->queue_size) && (pos->was_transmitted == GNUNET_NO))
     {
       GNUNET_assert (pos->response_proc != NULL);
-      /* move 'pos' element to head so that it will be 
+      /* move 'pos' element to head so that it will be
        * killed on 'NULL' call below */
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Dropping request from datastore queue\n");
-#endif
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "Dropping request from datastore queue\n");
       GNUNET_CONTAINER_DLL_remove (h->queue_head, h->queue_tail, pos);
       GNUNET_CONTAINER_DLL_insert (h->queue_head, h->queue_tail, pos);
       GNUNET_STATISTICS_update (h->stats,
@@ -480,10 +489,11 @@ make_queue_entry (struct GNUNET_DATASTORE_Handle *h,
 /**
  * Process entries in the queue (or do nothing if we are already
  * doing so).
- * 
+ *
  * @param h handle to the datastore
  */
-static void process_queue (struct GNUNET_DATASTORE_Handle *h);
+static void
+process_queue (struct GNUNET_DATASTORE_Handle *h);
 
 
 /**
@@ -507,17 +517,14 @@ try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   h->client = GNUNET_CLIENT_connect ("datastore", h->cfg);
   if (h->client == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "DATASTORE reconnect failed (fatally)\n");
+    LOG (GNUNET_ERROR_TYPE_ERROR, "DATASTORE reconnect failed (fatally)\n");
     return;
   }
   GNUNET_STATISTICS_update (h->stats,
                             gettext_noop
                             ("# datastore connections (re)created"), 1,
                             GNUNET_NO);
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reconnected to DATASTORE\n");
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnected to DATASTORE\n");
   process_queue (h);
 }
 
@@ -533,22 +540,19 @@ do_disconnect (struct GNUNET_DATASTORE_Handle *h)
 {
   if (h->client == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "client NULL in disconnect, will not try to reconnect\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "client NULL in disconnect, will not try to reconnect\n");
     return;
   }
 #if 0
-  GNUNET_STATISTICS_update (stats,
-                            gettext_noop ("# reconnected to DATASTORE"),
+  GNUNET_STATISTICS_update (stats, gettext_noop ("# reconnected to DATASTORE"),
                             1, GNUNET_NO);
 #endif
-  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (h->client);
   h->skip_next_messages = 0;
   h->client = NULL;
-  h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->retry_time,
-                                                    &try_reconnect, h);
+  h->reconnect_task =
+      GNUNET_SCHEDULER_add_delayed (h->retry_time, &try_reconnect, h);
 }
 
 
@@ -566,9 +570,7 @@ receive_cb (void *cls, const struct GNUNET_MessageHeader *msg)
   struct GNUNET_DATASTORE_QueueEntry *qe;
 
   h->in_receive = GNUNET_NO;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving reply from datastore\n");
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving reply from datastore\n");
   if (h->skip_next_messages > 0)
   {
     h->skip_next_messages--;
@@ -605,8 +607,7 @@ transmit_request (void *cls, size_t size, void *buf)
     return 0;                   /* no entry in queue */
   if (buf == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to transmit request to DATASTORE.\n"));
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to transmit request to DATASTORE.\n");
     GNUNET_STATISTICS_update (h->stats,
                               gettext_noop ("# transmission request failures"),
                               1, GNUNET_NO);
@@ -618,22 +619,19 @@ transmit_request (void *cls, size_t size, void *buf)
     process_queue (h);
     return 0;
   }
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting %u byte request to DATASTORE\n", msize);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u byte request to DATASTORE\n",
+       msize);
   memcpy (buf, &qe[1], msize);
   qe->was_transmitted = GNUNET_YES;
   GNUNET_SCHEDULER_cancel (qe->task);
   qe->task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_assert (GNUNET_NO == h->in_receive);
   h->in_receive = GNUNET_YES;
-  GNUNET_CLIENT_receive (h->client,
-                         &receive_cb,
-                         h, GNUNET_TIME_absolute_get_remaining (qe->timeout));
+  GNUNET_CLIENT_receive (h->client, &receive_cb, h,
+                         GNUNET_TIME_absolute_get_remaining (qe->timeout));
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# bytes sent to datastore"),
-                            1, GNUNET_NO);
+                            gettext_noop ("# bytes sent to datastore"), 1,
+                            GNUNET_NO);
   return msize;
 }
 
@@ -641,7 +639,7 @@ transmit_request (void *cls, size_t size, void *buf)
 /**
  * Process entries in the queue (or do nothing if we are already
  * doing so).
- * 
+ *
  * @param h handle to the datastore
  */
 static void
@@ -651,30 +649,22 @@ process_queue (struct GNUNET_DATASTORE_Handle *h)
 
   if (NULL == (qe = h->queue_head))
   {
-#if DEBUG_DATASTORE > 1
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Queue empty\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Queue empty\n");
     return;                     /* no entry in queue */
   }
   if (qe->was_transmitted == GNUNET_YES)
   {
-#if DEBUG_DATASTORE > 1
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Head request already transmitted\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Head request already transmitted\n");
     return;                     /* waiting for replies */
   }
   if (h->th != NULL)
   {
-#if DEBUG_DATASTORE > 1
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Pending transmission request\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Pending transmission request\n");
     return;                     /* request pending */
   }
   if (h->client == NULL)
   {
-#if DEBUG_DATASTORE > 1
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not connected\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Not connected\n");
     return;                     /* waiting for reconnect */
   }
   if (GNUNET_YES == h->in_receive)
@@ -682,15 +672,13 @@ process_queue (struct GNUNET_DATASTORE_Handle *h)
     /* wait for response to previous query */
     return;
   }
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Queueing %u byte request to DATASTORE\n", qe->message_size);
-#endif
-  h->th = GNUNET_CLIENT_notify_transmit_ready (h->client,
-                                               qe->message_size,
-                                               GNUNET_TIME_absolute_get_remaining
-                                               (qe->timeout), GNUNET_YES,
-                                               &transmit_request, h);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Queueing %u byte request to DATASTORE\n",
+       qe->message_size);
+  h->th =
+      GNUNET_CLIENT_notify_transmit_ready (h->client, qe->message_size,
+                                           GNUNET_TIME_absolute_get_remaining
+                                           (qe->timeout), GNUNET_YES,
+                                           &transmit_request, h);
   GNUNET_assert (GNUNET_NO == h->in_receive);
   GNUNET_break (NULL != h->th);
 }
@@ -700,11 +688,14 @@ process_queue (struct GNUNET_DATASTORE_Handle *h)
  * Dummy continuation used to do nothing (but be non-zero).
  *
  * @param cls closure
- * @param result result 
+ * @param result result
+ * @param min_expiration expiration time
  * @param emsg error message
  */
 static void
-drop_status_cont (void *cls, int32_t result, const char *emsg)
+drop_status_cont (void *cls, int32_t result, 
+		  struct GNUNET_TIME_Absolute min_expiration,
+		  const char *emsg)
 {
   /* do nothing */
 }
@@ -714,7 +705,7 @@ drop_status_cont (void *cls, int32_t result, const char *emsg)
  * Free a queue entry.  Removes the given entry from the
  * queue and releases associated resources.  Does NOT
  * call the callback.
- * 
+ *
  * @param qe entry to free.
  */
 static void
@@ -768,8 +759,8 @@ process_status_message (void *cls, const struct GNUNET_MessageHeader *msg)
     else
       process_queue (h);
     if (rc.cont != NULL)
-      rc.cont (rc.cont_cls,
-               GNUNET_SYSERR,
+      rc.cont (rc.cont_cls, GNUNET_SYSERR,
+	       GNUNET_TIME_UNIT_ZERO_ABS,
                _("Failed to receive status response from database."));
     return;
   }
@@ -782,8 +773,8 @@ process_status_message (void *cls, const struct GNUNET_MessageHeader *msg)
     h->retry_time = GNUNET_TIME_UNIT_ZERO;
     do_disconnect (h);
     if (rc.cont != NULL)
-      rc.cont (rc.cont_cls,
-               GNUNET_SYSERR,
+      rc.cont (rc.cont_cls, GNUNET_SYSERR,
+	       GNUNET_TIME_UNIT_ZERO_ABS,
                _("Error reading response from datastore service"));
     return;
   }
@@ -804,17 +795,16 @@ process_status_message (void *cls, const struct GNUNET_MessageHeader *msg)
     GNUNET_break (0);
     emsg = _("Invalid error message received from datastore service");
   }
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received status %d/%s\n", (int) status, emsg);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Received status %d/%s\n", (int) status, emsg);
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# status messages received"),
-                            1, GNUNET_NO);
+                            gettext_noop ("# status messages received"), 1,
+                            GNUNET_NO);
   h->retry_time.rel_value = 0;
   process_queue (h);
   if (rc.cont != NULL)
-    rc.cont (rc.cont_cls, status, emsg);
+    rc.cont (rc.cont_cls, status, 
+	     GNUNET_TIME_absolute_ntoh (sm->min_expiration),
+	     emsg);
 }
 
 
@@ -845,18 +835,13 @@ process_status_message (void *cls, const struct GNUNET_MessageHeader *msg)
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
-                      uint32_t rid,
-                      const GNUNET_HashCode * key,
-                      size_t size,
-                      const void *data,
-                      enum GNUNET_BLOCK_Type type,
-                      uint32_t priority,
-                      uint32_t anonymity,
+GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, uint32_t rid,
+                      const struct GNUNET_HashCode * key, size_t size,
+                      const void *data, enum GNUNET_BLOCK_Type type,
+                      uint32_t priority, uint32_t anonymity,
                       uint32_t replication,
                       struct GNUNET_TIME_Absolute expiration,
-                      unsigned int queue_priority,
-                      unsigned int max_queue_size,
+                      unsigned int queue_priority, unsigned int max_queue_size,
                       struct GNUNET_TIME_Relative timeout,
                       GNUNET_DATASTORE_ContinuationWithStatus cont,
                       void *cont_cls)
@@ -866,30 +851,22 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
   size_t msize;
   union QueueContext qc;
 
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to put %u bytes of data under key `%s' for %llu ms\n",
-              size,
-              GNUNET_h2s (key),
-              GNUNET_TIME_absolute_get_remaining (expiration).rel_value);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Asked to put %u bytes of data under key `%s' for %llu ms\n", size,
+       GNUNET_h2s (key),
+       GNUNET_TIME_absolute_get_remaining (expiration).rel_value);
   msize = sizeof (struct DataMessage) + size;
   GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
   qc.sc.cont = cont;
   qc.sc.cont_cls = cont_cls;
-  qe = make_queue_entry (h, msize,
-                         queue_priority, max_queue_size, timeout,
+  qe = make_queue_entry (h, msize, queue_priority, max_queue_size, timeout,
                          &process_status_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry for PUT\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for PUT\n");
     return NULL;
   }
-  GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# PUT requests executed"),
+  GNUNET_STATISTICS_update (h->stats, gettext_noop ("# PUT requests executed"),
                             1, GNUNET_NO);
   dm = (struct DataMessage *) &qe[1];
   dm->header.type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_PUT);
@@ -930,10 +907,8 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
-                          uint64_t amount,
-                          uint32_t entries,
-                          unsigned int queue_priority,
+GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h, uint64_t amount,
+                          uint32_t entries, unsigned int queue_priority,
                           unsigned int max_queue_size,
                           struct GNUNET_TIME_Relative timeout,
                           GNUNET_DATASTORE_ContinuationWithStatus cont,
@@ -945,27 +920,21 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
 
   if (cont == NULL)
     cont = &drop_status_cont;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to reserve %llu bytes of data and %u entries\n",
-              (unsigned long long) amount, (unsigned int) entries);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Asked to reserve %llu bytes of data and %u entries\n",
+       (unsigned long long) amount, (unsigned int) entries);
   qc.sc.cont = cont;
   qc.sc.cont_cls = cont_cls;
-  qe = make_queue_entry (h, sizeof (struct ReserveMessage),
-                         queue_priority, max_queue_size, timeout,
-                         &process_status_message, &qc);
+  qe = make_queue_entry (h, sizeof (struct ReserveMessage), queue_priority,
+                         max_queue_size, timeout, &process_status_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry to reserve\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry to reserve\n");
     return NULL;
   }
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# RESERVE requests executed"),
-                            1, GNUNET_NO);
+                            gettext_noop ("# RESERVE requests executed"), 1,
+                            GNUNET_NO);
   rm = (struct ReserveMessage *) &qe[1];
   rm->header.type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_RESERVE);
   rm->header.size = htons (sizeof (struct ReserveMessage));
@@ -999,8 +968,7 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
  */
 struct GNUNET_DATASTORE_QueueEntry *
 GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
-                                  uint32_t rid,
-                                  unsigned int queue_priority,
+                                  uint32_t rid, unsigned int queue_priority,
                                   unsigned int max_queue_size,
                                   struct GNUNET_TIME_Relative timeout,
                                   GNUNET_DATASTORE_ContinuationWithStatus cont,
@@ -1012,9 +980,7 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
 
   if (cont == NULL)
     cont = &drop_status_cont;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asked to release reserve %d\n", rid);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to release reserve %d\n", rid);
   qc.sc.cont = cont;
   qc.sc.cont_cls = cont_cls;
   qe = make_queue_entry (h, sizeof (struct ReleaseReserveMessage),
@@ -1022,10 +988,8 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
                          &process_status_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry to release reserve\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Could not create queue entry to release reserve\n");
     return NULL;
   }
   GNUNET_STATISTICS_update (h->stats,
@@ -1059,8 +1023,7 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h,
-                         uint64_t uid,
+GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h, uint64_t uid,
                          uint32_t priority,
                          struct GNUNET_TIME_Absolute expiration,
                          unsigned int queue_priority,
@@ -1075,29 +1038,21 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h,
 
   if (cont == NULL)
     cont = &drop_status_cont;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to update entry %llu raising priority by %u and expiration to %llu\n",
-              uid,
-              (unsigned int) priority,
-              (unsigned long long) expiration.abs_value);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Asked to update entry %llu raising priority by %u and expiration to %llu\n",
+       uid, (unsigned int) priority, (unsigned long long) expiration.abs_value);
   qc.sc.cont = cont;
   qc.sc.cont_cls = cont_cls;
-  qe = make_queue_entry (h, sizeof (struct UpdateMessage),
-                         queue_priority, max_queue_size, timeout,
-                         &process_status_message, &qc);
+  qe = make_queue_entry (h, sizeof (struct UpdateMessage), queue_priority,
+                         max_queue_size, timeout, &process_status_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry for UPDATE\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for UPDATE\n");
     return NULL;
   }
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# UPDATE requests executed"),
-                            1, GNUNET_NO);
+                            gettext_noop ("# UPDATE requests executed"), 1,
+                            GNUNET_NO);
   um = (struct UpdateMessage *) &qe[1];
   um->header.type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE);
   um->header.size = htons (sizeof (struct UpdateMessage));
@@ -1132,10 +1087,8 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h,
  */
 struct GNUNET_DATASTORE_QueueEntry *
 GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
-                         const GNUNET_HashCode * key,
-                         size_t size,
-                         const void *data,
-                         unsigned int queue_priority,
+                         const struct GNUNET_HashCode * key, size_t size,
+                         const void *data, unsigned int queue_priority,
                          unsigned int max_queue_size,
                          struct GNUNET_TIME_Relative timeout,
                          GNUNET_DATASTORE_ContinuationWithStatus cont,
@@ -1148,29 +1101,22 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
 
   if (cont == NULL)
     cont = &drop_status_cont;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to remove %u bytes under key `%s'\n",
-              size, GNUNET_h2s (key));
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to remove %u bytes under key `%s'\n",
+       size, GNUNET_h2s (key));
   qc.sc.cont = cont;
   qc.sc.cont_cls = cont_cls;
   msize = sizeof (struct DataMessage) + size;
   GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  qe = make_queue_entry (h, msize,
-                         queue_priority, max_queue_size, timeout,
+  qe = make_queue_entry (h, msize, queue_priority, max_queue_size, timeout,
                          &process_status_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry for REMOVE\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for REMOVE\n");
     return NULL;
   }
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# REMOVE requests executed"),
-                            1, GNUNET_NO);
+                            gettext_noop ("# REMOVE requests executed"), 1,
+                            GNUNET_NO);
   dm = (struct DataMessage *) &qe[1];
   dm->header.type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE);
   dm->header.size = htons (msize);
@@ -1213,8 +1159,8 @@ process_result_message (void *cls, const struct GNUNET_MessageHeader *msg)
     free_queue_entry (qe);
     if (was_transmitted == GNUNET_YES)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("Failed to receive response from database.\n"));
+      LOG (GNUNET_ERROR_TYPE_WARNING,
+           _("Failed to receive response from database.\n"));
       do_disconnect (h);
     }
     else
@@ -1222,8 +1168,8 @@ process_result_message (void *cls, const struct GNUNET_MessageHeader *msg)
       process_queue (h);
     }
     if (rc.proc != NULL)
-      rc.proc (rc.proc_cls,
-               NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
+      rc.proc (rc.proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS,
+               0);
     return;
   }
   if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END)
@@ -1233,17 +1179,14 @@ process_result_message (void *cls, const struct GNUNET_MessageHeader *msg)
     rc = qe->qc.rc;
     GNUNET_assert (GNUNET_YES == qe->was_transmitted);
     free_queue_entry (qe);
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received end of result set, new queue size is %u\n",
-                h->queue_size);
-#endif
-    if (rc.proc != NULL)
-      rc.proc (rc.proc_cls,
-               NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Received end of result set, new queue size is %u\n", h->queue_size);
     h->retry_time.rel_value = 0;
     h->result_count = 0;
     process_queue (h);
+    if (rc.proc != NULL)
+      rc.proc (rc.proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS,
+               0);
     return;
   }
   qe = h->queue_head;
@@ -1256,8 +1199,8 @@ process_result_message (void *cls, const struct GNUNET_MessageHeader *msg)
     h->retry_time = GNUNET_TIME_UNIT_ZERO;
     do_disconnect (h);
     if (rc.proc != NULL)
-      rc.proc (rc.proc_cls,
-               NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
+      rc.proc (rc.proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS,
+               0);
     return;
   }
   if ((ntohs (msg->size) < sizeof (struct DataMessage)) ||
@@ -1271,30 +1214,23 @@ process_result_message (void *cls, const struct GNUNET_MessageHeader *msg)
     h->retry_time = GNUNET_TIME_UNIT_ZERO;
     do_disconnect (h);
     if (rc.proc != NULL)
-      rc.proc (rc.proc_cls,
-               NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
+      rc.proc (rc.proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS,
+               0);
     return;
   }
-  GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# Results received"), 1, GNUNET_NO);
+  GNUNET_STATISTICS_update (h->stats, gettext_noop ("# Results received"), 1,
+                            GNUNET_NO);
   dm = (const struct DataMessage *) msg;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received result %llu with type %u and size %u with key %s\n",
-              (unsigned long long) GNUNET_ntohll (dm->uid),
-              ntohl (dm->type), ntohl (dm->size), GNUNET_h2s (&dm->key));
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received result %llu with type %u and size %u with key %s\n",
+       (unsigned long long) GNUNET_ntohll (dm->uid), ntohl (dm->type),
+       ntohl (dm->size), GNUNET_h2s (&dm->key));
   free_queue_entry (qe);
   h->retry_time.rel_value = 0;
   process_queue (h);
   if (rc.proc != NULL)
-    rc.proc (rc.proc_cls,
-             &dm->key,
-             ntohl (dm->size),
-             &dm[1],
-             ntohl (dm->type),
-             ntohl (dm->priority),
-             ntohl (dm->anonymity),
+    rc.proc (rc.proc_cls, &dm->key, ntohl (dm->size), &dm[1], ntohl (dm->type),
+             ntohl (dm->priority), ntohl (dm->anonymity),
              GNUNET_TIME_absolute_ntoh (dm->expiration),
              GNUNET_ntohll (dm->uid));
 }
@@ -1332,11 +1268,8 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
   union QueueContext qc;
 
   GNUNET_assert (NULL != proc);
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to get replication entry in %llu ms\n",
-              (unsigned long long) timeout.rel_value);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to get replication entry in %llu ms\n",
+       (unsigned long long) timeout.rel_value);
   qc.rc.proc = proc;
   qc.rc.proc_cls = proc_cls;
   qe = make_queue_entry (h, sizeof (struct GNUNET_MessageHeader),
@@ -1344,10 +1277,8 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
                          &process_result_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry for GET REPLICATION\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Could not create queue entry for GET REPLICATION\n");
     return NULL;
   }
   GNUNET_STATISTICS_update (h->stats,
@@ -1398,12 +1329,10 @@ GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
 
   GNUNET_assert (NULL != proc);
   GNUNET_assert (type != GNUNET_BLOCK_TYPE_ANY);
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to get %llu-th zero-anonymity entry of type %d in %llu ms\n",
-              (unsigned long long) offset,
-              type, (unsigned long long) timeout.rel_value);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Asked to get %llu-th zero-anonymity entry of type %d in %llu ms\n",
+       (unsigned long long) offset, type,
+       (unsigned long long) timeout.rel_value);
   qc.rc.proc = proc;
   qc.rc.proc_cls = proc_cls;
   qe = make_queue_entry (h, sizeof (struct GetZeroAnonymityMessage),
@@ -1411,10 +1340,8 @@ GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
                          &process_result_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not create queue entry for zero-anonymity procation\n");
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Could not create queue entry for zero-anonymity procation\n");
     return NULL;
   }
   GNUNET_STATISTICS_update (h->stats,
@@ -1453,9 +1380,8 @@ GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
  *         cancel
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h,
-                          uint64_t offset,
-                          const GNUNET_HashCode * key,
+GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h, uint64_t offset,
+                          const struct GNUNET_HashCode * key,
                           enum GNUNET_BLOCK_Type type,
                           unsigned int queue_priority,
                           unsigned int max_queue_size,
@@ -1467,26 +1393,20 @@ GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h,
   union QueueContext qc;
 
   GNUNET_assert (NULL != proc);
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to look for data of type %u under key `%s'\n",
-              (unsigned int) type, GNUNET_h2s (key));
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Asked to look for data of type %u under key `%s'\n",
+       (unsigned int) type, GNUNET_h2s (key));
   qc.rc.proc = proc;
   qc.rc.proc_cls = proc_cls;
-  qe = make_queue_entry (h, sizeof (struct GetMessage),
-                         queue_priority, max_queue_size, timeout,
-                         &process_result_message, &qc);
+  qe = make_queue_entry (h, sizeof (struct GetMessage), queue_priority,
+                         max_queue_size, timeout, &process_result_message, &qc);
   if (qe == NULL)
   {
-#if DEBUG_DATASTORE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not queue request for `%s'\n", GNUNET_h2s (key));
-#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not queue request for `%s'\n",
+         GNUNET_h2s (key));
     return NULL;
   }
-  GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# GET requests executed"),
+  GNUNET_STATISTICS_update (h->stats, gettext_noop ("# GET requests executed"),
                             1, GNUNET_NO);
   gm = (struct GetMessage *) &qe[1];
   gm->header.type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_GET);
@@ -1500,7 +1420,7 @@ GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h,
   else
   {
     gm->header.size =
-        htons (sizeof (struct GetMessage) - sizeof (GNUNET_HashCode));
+        htons (sizeof (struct GetMessage) - sizeof (struct GNUNET_HashCode));
   }
   process_queue (h);
   return qe;
@@ -1510,7 +1430,7 @@ GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h,
 /**
  * Cancel a datastore operation.  The final callback from the
  * operation must not have been done yet.
- * 
+ *
  * @param qe operation to cancel
  */
 void
@@ -1520,11 +1440,9 @@ GNUNET_DATASTORE_cancel (struct GNUNET_DATASTORE_QueueEntry *qe)
 
   GNUNET_assert (GNUNET_SYSERR != qe->was_transmitted);
   h = qe->h;
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Pending DATASTORE request %p cancelled (%d, %d)\n",
-              qe, qe->was_transmitted, h->queue_head == qe);
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Pending DATASTORE request %p cancelled (%d, %d)\n", qe,
+       qe->was_transmitted, h->queue_head == qe);
   if (GNUNET_YES == qe->was_transmitted)
   {
     free_queue_entry (qe);