aboutsummaryrefslogtreecommitdiff
path: root/src/datastore/datastore_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/datastore/datastore_api.c')
-rw-r--r--src/datastore/datastore_api.c94
1 files changed, 23 insertions, 71 deletions
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 4f406a2..57663e9 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -270,6 +270,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.
*
* @param cls the 'struct GNUNET_DATASTORE_Handle'
@@ -287,14 +303,16 @@ transmit_drop (void *cls, size_t size, void *buf)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Failed to transmit request to drop database.\n"));
- GNUNET_DATASTORE_disconnect (h, GNUNET_NO);
+ 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);
}
@@ -311,9 +329,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop)
{
struct GNUNET_DATASTORE_QueueEntry *qe;
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Datastore disconnect\n");
-#endif
if (NULL != h->th)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
@@ -321,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)
@@ -346,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);
@@ -373,9 +389,7 @@ timeout_queue_entry (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_NO);
qe->task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_assert (qe->was_transmitted == GNUNET_NO);
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Timeout of request in datastore queue\n");
-#endif
qe->response_proc (qe->h, NULL);
}
@@ -455,9 +469,7 @@ make_queue_entry (struct GNUNET_DATASTORE_Handle *h, size_t msize,
GNUNET_assert (pos->response_proc != NULL);
/* move 'pos' element to head so that it will be
* killed on 'NULL' call below */
-#if DEBUG_DATASTORE
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);
GNUNET_STATISTICS_update (h->stats,
@@ -512,9 +524,7 @@ try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
gettext_noop
("# datastore connections (re)created"), 1,
GNUNET_NO);
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnected to DATASTORE\n");
-#endif
process_queue (h);
}
@@ -530,17 +540,15 @@ do_disconnect (struct GNUNET_DATASTORE_Handle *h)
{
if (h->client == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"client NULL in disconnect, will not try to reconnect\n");
-#endif
return;
}
#if 0
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 =
@@ -562,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
LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving reply from datastore\n");
-#endif
if (h->skip_next_messages > 0)
{
h->skip_next_messages--;
@@ -601,9 +607,7 @@ transmit_request (void *cls, size_t size, void *buf)
return 0; /* no entry in queue */
if (buf == NULL)
{
-#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);
@@ -615,10 +619,8 @@ transmit_request (void *cls, size_t size, void *buf)
process_queue (h);
return 0;
}
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u byte request to DATASTORE\n",
msize);
-#endif
memcpy (buf, &qe[1], msize);
qe->was_transmitted = GNUNET_YES;
GNUNET_SCHEDULER_cancel (qe->task);
@@ -647,30 +649,22 @@ process_queue (struct GNUNET_DATASTORE_Handle *h)
if (NULL == (qe = h->queue_head))
{
-#if DEBUG_DATASTORE > 1
LOG (GNUNET_ERROR_TYPE_DEBUG, "Queue empty\n");
-#endif
return; /* no entry in queue */
}
if (qe->was_transmitted == GNUNET_YES)
{
-#if DEBUG_DATASTORE > 1
LOG (GNUNET_ERROR_TYPE_DEBUG, "Head request already transmitted\n");
-#endif
return; /* waiting for replies */
}
if (h->th != NULL)
{
-#if DEBUG_DATASTORE > 1
LOG (GNUNET_ERROR_TYPE_DEBUG, "Pending transmission request\n");
-#endif
return; /* request pending */
}
if (h->client == NULL)
{
-#if DEBUG_DATASTORE > 1
LOG (GNUNET_ERROR_TYPE_DEBUG, "Not connected\n");
-#endif
return; /* waiting for reconnect */
}
if (GNUNET_YES == h->in_receive)
@@ -678,10 +672,8 @@ process_queue (struct GNUNET_DATASTORE_Handle *h)
/* wait for response to previous query */
return;
}
-#if DEBUG_DATASTORE
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
@@ -803,9 +795,7 @@ process_status_message (void *cls, const struct GNUNET_MessageHeader *msg)
GNUNET_break (0);
emsg = _("Invalid error message received from datastore service");
}
-#if DEBUG_DATASTORE
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,
GNUNET_NO);
@@ -861,12 +851,10 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, uint32_t rid,
size_t msize;
union QueueContext qc;
-#if DEBUG_DATASTORE
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);
qc.sc.cont = cont;
@@ -875,9 +863,7 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, uint32_t rid,
&process_status_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for PUT\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats, gettext_noop ("# PUT requests executed"),
@@ -934,20 +920,16 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h, uint64_t amount,
if (cont == NULL)
cont = &drop_status_cont;
-#if DEBUG_DATASTORE
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;
qe = make_queue_entry (h, sizeof (struct ReserveMessage), queue_priority,
max_queue_size, timeout, &process_status_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry to reserve\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats,
@@ -998,9 +980,7 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
if (cont == NULL)
cont = &drop_status_cont;
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to release reserve %d\n", rid);
-#endif
qc.sc.cont = cont;
qc.sc.cont_cls = cont_cls;
qe = make_queue_entry (h, sizeof (struct ReleaseReserveMessage),
@@ -1008,10 +988,8 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
&process_status_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Could not create queue entry to release reserve\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats,
@@ -1060,20 +1038,16 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h, uint64_t uid,
if (cont == NULL)
cont = &drop_status_cont;
-#if DEBUG_DATASTORE
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;
qe = make_queue_entry (h, sizeof (struct UpdateMessage), queue_priority,
max_queue_size, timeout, &process_status_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for UPDATE\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats,
@@ -1127,10 +1101,8 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
if (cont == NULL)
cont = &drop_status_cont;
-#if DEBUG_DATASTORE
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;
msize = sizeof (struct DataMessage) + size;
@@ -1139,9 +1111,7 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
&process_status_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not create queue entry for REMOVE\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats,
@@ -1209,10 +1179,8 @@ 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
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received end of result set, new queue size is %u\n", h->queue_size);
-#endif
h->retry_time.rel_value = 0;
h->result_count = 0;
process_queue (h);
@@ -1253,12 +1221,10 @@ process_result_message (void *cls, const struct GNUNET_MessageHeader *msg)
GNUNET_STATISTICS_update (h->stats, gettext_noop ("# Results received"), 1,
GNUNET_NO);
dm = (const struct DataMessage *) msg;
-#if DEBUG_DATASTORE
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;
process_queue (h);
@@ -1302,10 +1268,8 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
union QueueContext qc;
GNUNET_assert (NULL != proc);
-#if DEBUG_DATASTORE
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;
qe = make_queue_entry (h, sizeof (struct GNUNET_MessageHeader),
@@ -1313,10 +1277,8 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
&process_result_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Could not create queue entry for GET REPLICATION\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats,
@@ -1367,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
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;
qe = make_queue_entry (h, sizeof (struct GetZeroAnonymityMessage),
@@ -1380,10 +1340,8 @@ GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
&process_result_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Could not create queue entry for zero-anonymity procation\n");
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats,
@@ -1435,21 +1393,17 @@ GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h, uint64_t offset,
union QueueContext qc;
GNUNET_assert (NULL != proc);
-#if DEBUG_DATASTORE
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;
qe = make_queue_entry (h, sizeof (struct GetMessage), queue_priority,
max_queue_size, timeout, &process_result_message, &qc);
if (qe == NULL)
{
-#if DEBUG_DATASTORE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Could not queue request for `%s'\n",
GNUNET_h2s (key));
-#endif
return NULL;
}
GNUNET_STATISTICS_update (h->stats, gettext_noop ("# GET requests executed"),
@@ -1486,11 +1440,9 @@ GNUNET_DATASTORE_cancel (struct GNUNET_DATASTORE_QueueEntry *qe)
GNUNET_assert (GNUNET_SYSERR != qe->was_transmitted);
h = qe->h;
-#if DEBUG_DATASTORE
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)
{
free_queue_entry (qe);
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-21 19:22:46 +0000