[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25370 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25370 - gnunet/src/fs |
Date: |
Mon, 10 Dec 2012 16:32:30 +0100 |
Author: grothoff
Date: 2012-12-10 16:32:30 +0100 (Mon, 10 Dec 2012)
New Revision: 25370
Modified:
gnunet/src/fs/gnunet-service-fs_lc.c
gnunet/src/fs/gnunet-service-fs_stream.c
Log:
-fix
Modified: gnunet/src/fs/gnunet-service-fs_lc.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_lc.c 2012-12-10 15:04:30 UTC (rev
25369)
+++ gnunet/src/fs/gnunet-service-fs_lc.c 2012-12-10 15:32:30 UTC (rev
25370)
@@ -275,9 +275,14 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queued reply to query `%s' for local client\n",
GNUNET_h2s (&prd->query), (unsigned int) prd->type);
- if (eval != GNUNET_BLOCK_EVALUATION_OK_LAST)
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Evaluation %d - keeping query alive\n",
+ (int) eval);
return;
- if (GNUNET_SCHEDULER_NO_TASK != cr->kill_task)
+ }
+ if (GNUNET_SCHEDULER_NO_TASK == cr->kill_task)
cr->kill_task = GNUNET_SCHEDULER_add_now (&client_request_destroy, cr);
}
@@ -480,18 +485,13 @@
pos = client_head;
while ((pos != NULL) && (pos->client != client))
pos = pos->next;
- if (pos == NULL)
+ if (NULL == pos)
return;
while (NULL != (cr = pos->cr_head))
{
- GNUNET_CONTAINER_DLL_remove (pos->cr_head, pos->cr_tail, cr);
- GSF_pending_request_cancel_ (cr->pr, GNUNET_YES);
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# client searches active"), -1,
- GNUNET_NO);
if (GNUNET_SCHEDULER_NO_TASK != cr->kill_task)
GNUNET_SCHEDULER_cancel (cr->kill_task);
- GNUNET_free (cr);
+ client_request_destroy (cr, NULL);
}
while (NULL != (res = pos->res_head))
{
Modified: gnunet/src/fs/gnunet-service-fs_stream.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_stream.c 2012-12-10 15:04:30 UTC (rev
25369)
+++ gnunet/src/fs/gnunet-service-fs_stream.c 2012-12-10 15:32:30 UTC (rev
25370)
@@ -1037,7 +1037,7 @@
GNUNET_SERVER_mst_receive (sc->mst,
NULL,
NULL, 0,
- GNUNET_NO, GNUNET_YES);
+ GNUNET_NO, GNUNET_NO);
if (GNUNET_NO == ret)
return;
refresh_timeout_task (sc);
@@ -1088,7 +1088,7 @@
GNUNET_SERVER_mst_receive (sc->mst,
NULL,
data, size,
- GNUNET_NO, GNUNET_YES);
+ GNUNET_NO, GNUNET_NO);
if (GNUNET_NO == ret)
return size; /* more messages in MST */
if (GNUNET_SYSERR == ret)
@@ -1219,6 +1219,8 @@
sc->qe = NULL;
if (GNUNET_BLOCK_TYPE_FS_ONDEMAND == type)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Performing on-demand encoding\n");
if (GNUNET_OK !=
GNUNET_FS_handle_on_demand_block (key,
size, data, type,
@@ -1227,6 +1229,8 @@
&handle_datastore_reply,
sc))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "On-demand encoding request failed\n");
continue_writing (sc);
}
return;
@@ -1238,8 +1242,9 @@
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting transmission of %u byte reply via stream\n",
- (unsigned int) size);
+ "Starting transmission of %u byte reply for query `%s' via
stream\n",
+ (unsigned int) size,
+ GNUNET_h2s (key));
wqi = GNUNET_malloc (sizeof (struct WriteQueueItem) + msize);
wqi->msize = msize;
srm = (struct StreamReplyMessage *) &wqi[1];
@@ -1302,7 +1307,11 @@
GNUNET_TIME_UNIT_FOREVER_REL,
&handle_datastore_reply, sc);
if (NULL == sc->qe)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Queueing request with datastore failed (queue full?)\n");
continue_writing (sc);
+ }
return GNUNET_OK;
default:
GNUNET_break_op (0);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25370 - gnunet/src/fs,
gnunet <=