[GNUnet-SVN] r14714 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2011-03-25 09:18:47 +0100 (Fri, 25 Mar 2011)
New Revision: 14714

Modified:
   gnunet/src/fs/gnunet-service-fs_lc.c
   gnunet/src/fs/gnunet-service-fs_new.c
   gnunet/src/fs/gnunet-service-fs_pr.c
Log:
fixes

Modified: gnunet/src/fs/gnunet-service-fs_lc.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_lc.c        2011-03-25 08:06:58 UTC (rev 
14713)
+++ gnunet/src/fs/gnunet-service-fs_lc.c        2011-03-25 08:18:47 UTC (rev 
14714)
@@ -232,12 +232,23 @@
   pm->expiration = GNUNET_TIME_absolute_hton (expiration);
   memcpy (&pm[1], data, data_len);      
   GSF_local_client_transmit_ (lc, &pm->header);
-
+#if DEBUG_FS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Queued reply to query `%s' for local client\n",
+             GNUNET_h2s (&prd->query),
+             (unsigned int) prd->type);
+#endif
   if (GNUNET_NO == more)               
     {
       GNUNET_CONTAINER_DLL_remove (lc->cr_head,
                                   lc->cr_tail,
                                   cr);
+      GNUNET_SERVER_receive_done (lc->client,
+                                 GNUNET_OK);
+      GNUNET_STATISTICS_update (GSF_stats,
+                               gettext_noop ("# client searches active"),
+                               - 1,
+                               GNUNET_NO);
       GNUNET_free (cr);
     }
 }
@@ -469,6 +480,10 @@
                                   pos->cr_tail,
                                   cr);
       GSF_pending_request_cancel_ (cr->pr);
+      GNUNET_STATISTICS_update (GSF_stats,
+                               gettext_noop ("# client searches active"),
+                               - 1,
+                               GNUNET_NO);
       GNUNET_free (cr);
     }
   while (NULL != (res = pos->res_head))

Modified: gnunet/src/fs/gnunet-service-fs_new.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_new.c       2011-03-25 08:06:58 UTC (rev 
14713)
+++ gnunet/src/fs/gnunet-service-fs_new.c       2011-03-25 08:18:47 UTC (rev 
14714)
@@ -339,11 +339,17 @@
   struct GNUNET_SERVER_Client *client = cls;
   struct GSF_PendingRequestData *prd;
 
+  prd = GSF_pending_request_get_data_ (pr);
+#if DEBUG_FS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Finished database lookup for local request `%s' with result 
%d\n",
+             GNUNET_h2s (&prd->query),
+             result);
+#endif
   GNUNET_SERVER_receive_done (client,
                              GNUNET_OK);
   if (GNUNET_BLOCK_EVALUATION_OK_LAST == result)
     return; /* we're done, 'pr' was already destroyed... */
-  prd = GSF_pending_request_get_data_ (pr);
   if (0 != (GSF_PRO_LOCAL_ONLY & prd->options) )
     {
       GSF_pending_request_cancel_ (pr);

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2011-03-25 08:06:58 UTC (rev 
14713)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2011-03-25 08:18:47 UTC (rev 
14714)
@@ -1034,10 +1034,21 @@
     GSF_update_datastore_delay_ (pr->public_data.start_time);
   process_reply (&prq, key, pr);
   if (prq.finished == GNUNET_YES)
-    return;
+    {
+#if DEBUG_FS
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Request processing finished, not asking datastore for 
more\n");
+#endif
+      return;
+    }
   pr->local_result = prq.eval;
   if (pr->qe == NULL)
-    return; /* done here */
+    {
+#if DEBUG_FS
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Request cancelled, not asking datastore for more\n");
+#endif
+    }
   if (prq.eval == GNUNET_BLOCK_EVALUATION_OK_LAST)
     {
       GNUNET_DATASTORE_get_next (GSF_dsh, GNUNET_NO);