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

[gnunet]

Author: grothoff
Date: 2011-06-16 15:46:20 +0200 (Thu, 16 Jun 2011)
New Revision: 15670

Modified:
   gnunet/src/fs/gnunet-service-fs_pr.c
Log:
fix

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2011-06-16 13:34:52 UTC (rev 
15669)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2011-06-16 13:46:20 UTC (rev 
15670)
@@ -1150,34 +1150,44 @@
   struct ProcessReplyClosure prq;
   GNUNET_HashCode query;
   unsigned int old_rf;
-  
-  pr->qe = NULL;
+
   GNUNET_SCHEDULER_cancel (pr->warn_task);
   pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
-  if (GNUNET_NO == pr->have_first_uid)
+  if (NULL != pr->qe)
     {
-      pr->first_uid = uid;
-      pr->have_first_uid = 1;
-    }
-  else
-    {
-      if (uid == pr->first_uid)
+      pr->qe = NULL;
+      if (NULL == key)
        {
          GNUNET_STATISTICS_update (GSF_stats,
-                                   gettext_noop ("# Datastore lookups 
concluded"),
+                                   gettext_noop ("# Datastore lookups 
concluded (no results)"),
                                    1,
                                    GNUNET_NO);
-         key = NULL; /* all replies seen! */
        }
-      pr->have_first_uid++;
-      if (pr->have_first_uid > MAX_RESULTS)
+      if (GNUNET_NO == pr->have_first_uid)
        {
-         GNUNET_STATISTICS_update (GSF_stats,
-                                   gettext_noop ("# Datastore lookups aborted 
(more than MAX_RESULTS)"),
-                                   1,
-                                   GNUNET_NO);
-         key = NULL; /* all replies seen! */
+         pr->first_uid = uid;
+         pr->have_first_uid = 1;
        }
+      else
+       {
+         if ( (uid == pr->first_uid) && (key != NULL) )
+           {
+             GNUNET_STATISTICS_update (GSF_stats,
+                                       gettext_noop ("# Datastore lookups 
concluded (seen all)"),
+                                       1,
+                                       GNUNET_NO);
+             key = NULL; /* all replies seen! */
+           }
+         pr->have_first_uid++;
+         if ( (pr->have_first_uid > MAX_RESULTS) && (key != NULL) )
+           {
+             GNUNET_STATISTICS_update (GSF_stats,
+                                       gettext_noop ("# Datastore lookups 
aborted (more than MAX_RESULTS)"),
+                                       1,
+                                       GNUNET_NO);
+             key = NULL; /* all replies seen! */
+           }
+       }
     }
   if (NULL == key)
     {
@@ -1250,7 +1260,13 @@
                                         &process_local_reply,
                                         pr);
       if (NULL != pr->qe)
-       return; /* we're done */        
+       {
+         GNUNET_STATISTICS_update (GSF_stats,
+                                   gettext_noop ("# Datastore lookups 
concluded (error queueing)"),
+                                   1,
+                                   GNUNET_NO);
+         return; /* we're done */      
+       }
       goto check_error_and_continue;
     }
   old_rf = pr->public_data.results_found;