[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21094 - gnunet/src/datastore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21094 - gnunet/src/datastore |
Date: |
Mon, 23 Apr 2012 07:54:35 +0200 |
Author: grothoff
Date: 2012-04-23 07:54:35 +0200 (Mon, 23 Apr 2012)
New Revision: 21094
Modified:
gnunet/src/datastore/datastore_api.c
Log:
-removing legacy DEBUG ifdefs
Modified: gnunet/src/datastore/datastore_api.c
===================================================================
--- gnunet/src/datastore/datastore_api.c 2012-04-23 05:23:13 UTC (rev
21093)
+++ gnunet/src/datastore/datastore_api.c 2012-04-23 05:54:35 UTC (rev
21094)
@@ -329,9 +329,7 @@
{
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);
@@ -391,9 +389,7 @@
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);
}
@@ -473,9 +469,7 @@
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,
@@ -530,9 +524,7 @@
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);
}
@@ -548,10 +540,8 @@
{
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
@@ -580,9 +570,7 @@
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--;
@@ -619,9 +607,7 @@
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);
@@ -633,10 +619,8 @@
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);
@@ -665,30 +649,22 @@
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)
@@ -696,10 +672,8 @@
/* 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
@@ -821,9 +795,7 @@
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);
@@ -879,12 +851,10 @@
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;
@@ -893,9 +863,7 @@
&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"),
@@ -952,20 +920,16 @@
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,
@@ -1016,9 +980,7 @@
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),
@@ -1026,10 +988,8 @@
&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,
@@ -1078,20 +1038,16 @@
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,
@@ -1145,10 +1101,8 @@
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;
@@ -1157,9 +1111,7 @@
&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,
@@ -1227,10 +1179,8 @@
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);
@@ -1271,12 +1221,10 @@
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);
@@ -1320,10 +1268,8 @@
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),
@@ -1331,10 +1277,8 @@
&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,
@@ -1385,12 +1329,10 @@
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),
@@ -1398,10 +1340,8 @@
&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,
@@ -1453,21 +1393,17 @@
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"),
@@ -1504,11 +1440,9 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21094 - gnunet/src/datastore,
gnunet <=