[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30790 - in gnunet/src: datastore fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30790 - in gnunet/src: datastore fs |
Date: |
Mon, 18 Nov 2013 21:42:29 +0100 |
Author: grothoff
Date: 2013-11-18 21:42:29 +0100 (Mon, 18 Nov 2013)
New Revision: 30790
Modified:
gnunet/src/datastore/datastore_api.c
gnunet/src/fs/gnunet-service-fs_pr.c
Log:
-doxygen, and likely fix for #2727
Modified: gnunet/src/datastore/datastore_api.c
===================================================================
--- gnunet/src/datastore/datastore_api.c 2013-11-18 19:46:08 UTC (rev
30789)
+++ gnunet/src/datastore/datastore_api.c 2013-11-18 20:42:29 UTC (rev
30790)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Christian Grothoff (and
other contributing authors)
+ (C) 2004-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -381,7 +381,7 @@
/**
* A request has timed out (before being transmitted to the service).
*
- * @param cls the 'struct GNUNET_DATASTORE_QueueEntry'
+ * @param cls the `struct GNUNET_DATASTORE_QueueEntry`
* @param tc scheduler context
*/
static void
@@ -394,7 +394,12 @@
GNUNET_NO);
qe->task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_assert (GNUNET_NO == qe->was_transmitted);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Timeout of request in datastore queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout of request in datastore queue\n");
+ /* response_proc's expect request at the head of the queue! */
+ GNUNET_CONTAINER_DLL_remove (h->queue_head, h->queue_tail, qe);
+ GNUNET_CONTAINER_DLL_insert (h->queue_head, h->queue_tail, qe);
+ GNUNET_assert (h->queue_head == qe);
qe->response_proc (qe->h, NULL);
}
@@ -410,7 +415,7 @@
* (if other requests of higher priority are in the queue)
* @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)
+ * @param qc client context (NOT a closure for @a response_proc)
* @return NULL if the queue is full
*/
static struct GNUNET_DATASTORE_QueueEntry *
@@ -472,10 +477,12 @@
{
if ((pos->max_queue < h->queue_size) && (pos->was_transmitted ==
GNUNET_NO))
{
- GNUNET_assert (pos->response_proc != NULL);
+ GNUNET_assert (NULL != pos->response_proc);
/* move 'pos' element to head so that it will be
* killed on 'NULL' call below */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Dropping request from datastore queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping request from datastore queue\n");
+ /* response_proc's expect request at the head of the queue! */
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,
@@ -1185,7 +1192,7 @@
h->retry_time = GNUNET_TIME_UNIT_ZERO;
h->result_count = 0;
process_queue (h);
- if (rc.proc != NULL)
+ if (NULL != rc.proc)
rc.proc (rc.proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS,
0);
return;
@@ -1279,7 +1286,7 @@
qe = make_queue_entry (h, sizeof (struct GNUNET_MessageHeader),
queue_priority, max_queue_size, timeout,
&process_result_message, &qc);
- if (qe == NULL)
+ if (NULL == qe)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Could not create queue entry for GET REPLICATION\n");
@@ -1342,7 +1349,7 @@
qe = make_queue_entry (h, sizeof (struct GetZeroAnonymityMessage),
queue_priority, max_queue_size, timeout,
&process_result_message, &qc);
- if (qe == NULL)
+ if (NULL == qe)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Could not create queue entry for zero-anonymity procation\n");
Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c 2013-11-18 19:46:08 UTC (rev
30789)
+++ gnunet/src/fs/gnunet-service-fs_pr.c 2013-11-18 20:42:29 UTC (rev
30790)
@@ -901,7 +901,7 @@
/**
- * Context for the 'put_migration_continuation'.
+ * Context for put_migration_continuation().
*/
struct PutMigrationContext
{
@@ -929,7 +929,7 @@
* operation.
*
* @param cls closure
- * @param success GNUNET_SYSERR on failure
+ * @param success #GNUNET_SYSERR on failure
* @param min_expiration minimum expiration time required for content to be
stored
* @param msg NULL on success, otherwise an error message
*/
@@ -1007,8 +1007,9 @@
* to even consider processing the query at
* all.
*
- * @return GNUNET_YES if the load is too high to do anything (load high)
- * GNUNET_NO to process normally (load normal or low)
+ * @param priority the priority of the item
+ * @return #GNUNET_YES if the load is too high to do anything (load high)
+ * #GNUNET_NO to process normally (load normal or low)
*/
static int
test_put_load_too_high (uint32_t priority)
@@ -1038,9 +1039,9 @@
* @param exp when will this value expire
* @param key key of the result
* @param get_path peers on reply path (or NULL if not recorded)
- * @param get_path_length number of entries in get_path
+ * @param get_path_length number of entries in @a get_path
* @param put_path peers on the PUT path (or NULL if not recorded)
- * @param put_path_length number of entries in get_path
+ * @param put_path_length number of entries in @a get_path
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30790 - in gnunet/src: datastore fs,
gnunet <=