#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
/**
* 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;
};
/**
- * Handle to the datastore service.
+ * Handle to the datastore service.
*/
struct GNUNET_DATASTORE_Handle
{
if (buf == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to transmit request to drop database.\n"));
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to transmit request to drop database.\n"));
GNUNET_DATASTORE_disconnect (h, GNUNET_NO);
return 0;
}
struct GNUNET_DATASTORE_QueueEntry *qe;
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Datastore disconnect\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Datastore disconnect\n");
#endif
if (NULL != h->th)
{
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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Timeout of request in datastore queue\n");
#endif
qe->response_proc (qe->h, NULL);
}
* @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,
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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Dropping request from datastore queue\n");
#endif
GNUNET_CONTAINER_DLL_remove (h->queue_head, h->queue_tail, pos);
GNUNET_CONTAINER_DLL_insert (h->queue_head, h->queue_tail, pos);
/**
* 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);
/**
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,
("# datastore connections (re)created"), 1,
GNUNET_NO);
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reconnected to DATASTORE\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnected to DATASTORE\n");
#endif
process_queue (h);
}
if (h->client == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "client NULL in disconnect, will not try to reconnect\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "client NULL in disconnect, will not try to reconnect\n");
#endif
return;
}
h->in_receive = GNUNET_NO;
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving reply from datastore\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving reply from datastore\n");
#endif
if (h->skip_next_messages > 0)
{
return 0; /* no entry in queue */
if (buf == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to transmit request to DATASTORE.\n"));
+#if DEBUG_DATASTORE
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to transmit request to DATASTORE.\n");
+#endif
GNUNET_STATISTICS_update (h->stats,
gettext_noop ("# transmission request failures"),
1, GNUNET_NO);
return 0;
}
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting %u byte request to DATASTORE\n", msize);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u byte request to DATASTORE\n",
+ msize);
#endif
memcpy (buf, &qe[1], msize);
qe->was_transmitted = GNUNET_YES;
/**
* Process entries in the queue (or do nothing if we are already
* doing so).
- *
+ *
* @param h handle to the datastore
*/
static void
if (NULL == (qe = h->queue_head))
{
#if DEBUG_DATASTORE > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Queue empty\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Queue empty\n");
#endif
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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Head request already transmitted\n");
#endif
return; /* waiting for replies */
}
if (h->th != NULL)
{
#if DEBUG_DATASTORE > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Pending transmission request\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Pending transmission request\n");
#endif
return; /* request pending */
}
if (h->client == NULL)
{
#if DEBUG_DATASTORE > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not connected\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Not connected\n");
#endif
return; /* waiting for reconnect */
}
return;
}
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Queueing %u byte request to DATASTORE\n", qe->message_size);
+ 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,
* 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 */
}
* 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
process_queue (h);
if (rc.cont != NULL)
rc.cont (rc.cont_cls, GNUNET_SYSERR,
+ GNUNET_TIME_UNIT_ZERO_ABS,
_("Failed to receive status response from database."));
return;
}
do_disconnect (h);
if (rc.cont != NULL)
rc.cont (rc.cont_cls, GNUNET_SYSERR,
+ GNUNET_TIME_UNIT_ZERO_ABS,
_("Error reading response from datastore service"));
return;
}
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received status %d/%s\n", (int) status, emsg);
#endif
GNUNET_STATISTICS_update (h->stats,
gettext_noop ("# status messages received"), 1,
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);
}
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);
+ 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
msize = sizeof (struct DataMessage) + size;
GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry for PUT\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for PUT\n");
#endif
return NULL;
}
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to reserve %llu bytes of data and %u entries\n",
+ (unsigned long long) amount, (unsigned int) entries);
#endif
qc.sc.cont = cont;
qc.sc.cont_cls = cont_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry to reserve\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry to reserve\n");
#endif
return NULL;
}
if (cont == NULL)
cont = &drop_status_cont;
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asked to release reserve %d\n", rid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to release reserve %d\n", rid);
#endif
qc.sc.cont = cont;
qc.sc.cont_cls = cont_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry to release reserve\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Could not create queue entry to release reserve\n");
#endif
return NULL;
}
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);
+ 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
qc.sc.cont = cont;
qc.sc.cont_cls = cont_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry for UPDATE\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for UPDATE\n");
#endif
return NULL;
}
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));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to remove %u bytes under key `%s'\n",
+ size, GNUNET_h2s (key));
#endif
qc.sc.cont = cont;
qc.sc.cont_cls = cont_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry for REMOVE\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for REMOVE\n");
#endif
return NULL;
}
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
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);
+ 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);
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;
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));
+ 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
free_queue_entry (qe);
h->retry_time.rel_value = 0;
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to get replication entry in %llu ms\n",
+ (unsigned long long) timeout.rel_value);
#endif
qc.rc.proc = proc;
qc.rc.proc_cls = proc_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry for GET REPLICATION\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Could not create queue entry for GET REPLICATION\n");
#endif
return NULL;
}
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);
+ 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
qc.rc.proc = proc;
qc.rc.proc_cls = proc_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Could not create queue entry for zero-anonymity procation\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Could not create queue entry for zero-anonymity procation\n");
#endif
return NULL;
}
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));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to look for data of type %u under key `%s'\n",
+ (unsigned int) type, GNUNET_h2s (key));
#endif
qc.rc.proc = proc;
qc.rc.proc_cls = proc_cls;
if (qe == NULL)
{
#if DEBUG_DATASTORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not queue request for `%s'\n",
- GNUNET_h2s (key));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not queue request for `%s'\n",
+ GNUNET_h2s (key));
#endif
return NULL;
}
/**
* Cancel a datastore operation. The final callback from the
* operation must not have been done yet.
- *
+ *
* @param qe operation to cancel
*/
void
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Pending DATASTORE request %p cancelled (%d, %d)\n", qe,
+ qe->was_transmitted, h->queue_head == qe);
#endif
if (GNUNET_YES == qe->was_transmitted)
{
projects / oweals / gnunet.git / blobdiff