-fix #2598

[oweals/gnunet.git] / src / fs / gnunet-service-fs.c

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 5923823ef9b50e106a196f00deb7962f2d228d3d..a129288abcaf8acf2aa8bd519e3ccf6850ef8432 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -63,6 +63,11 @@
  */
 #define COVER_AGE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
+/**
+ * Collect an instane number of statistics?  May cause excessive IPC.
+ */
+#define INSANE_STATISTICS GNUNET_NO
+
 
 /* ****************************** globals ****************************** */
 
@@ -232,9 +237,9 @@ update_latencies (const struct GNUNET_ATS_Information *atsi,
   {
     if (ntohl (atsi[i].type) == GNUNET_ATS_QUALITY_NET_DELAY)
     {
-      GSF_avg_latency.rel_value = (GSF_avg_latency.rel_value * 31 + 
-                                  GNUNET_MIN (5000,
-                                              ntohl (atsi[i].value))) / 32;
+      GSF_avg_latency.rel_value =
+          (GSF_avg_latency.rel_value * 31 +
+           GNUNET_MIN (5000, ntohl (atsi[i].value))) / 32;
       GNUNET_STATISTICS_set (GSF_stats,
                              gettext_noop
                              ("# running average P2P latency (ms)"),
@@ -296,9 +301,11 @@ consider_request_for_forwarding (void *cls,
 
   if (GNUNET_YES != GSF_pending_request_test_target_ (pr, peer))
   {
+#if INSANE_STATISTICS
     GNUNET_STATISTICS_update (GSF_stats,
                               gettext_noop ("# Loopback routes suppressed"), 1,
                               GNUNET_NO);
+#endif
     return;
   }
   GSF_plan_add_ (cp, pr);
@@ -348,6 +355,7 @@ handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
   pr = GSF_handle_p2p_query_ (other, message);
   if (NULL == pr)
     return GNUNET_SYSERR;
+  GSF_pending_request_get_data_ (pr)->has_started = GNUNET_YES;
   GSF_local_lookup_ (pr, &consider_forwarding, NULL);
   update_latencies (atsi, atsi_count);
   return GNUNET_OK;
@@ -372,11 +380,9 @@ start_p2p_processing (void *cls, struct GSF_PendingRequest *pr,
   struct GSF_PendingRequestData *prd;
 
   prd = GSF_pending_request_get_data_ (pr);
-#if DEBUG_FS_CLIENT
   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... */
@@ -405,8 +411,7 @@ handle_start_search (void *cls, struct GNUNET_SERVER_Client *client,
   int ret;
 
   pr = NULL;
-  ret = GSF_local_client_start_search_handler_ (client, message,
-                                               &pr);
+  ret = GSF_local_client_start_search_handler_ (client, message, &pr);
   switch (ret)
   {
   case GNUNET_SYSERR:
@@ -416,6 +421,7 @@ handle_start_search (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_OK);
     break;
   case GNUNET_YES:
+    GSF_pending_request_get_data_ (pr)->has_started = GNUNET_YES;
     GSF_local_lookup_ (pr, &start_p2p_processing, client);
     break;
   default:
@@ -477,7 +483,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @return GNUNET_YES to continue to iterate
  */
 static int
-consider_peer_for_forwarding (void *cls, const GNUNET_HashCode * key,
+consider_peer_for_forwarding (void *cls, const struct GNUNET_HashCode * key,
                               struct GSF_PendingRequest *pr)
 {
   struct GSF_ConnectedPeer *cp = cls;
@@ -572,11 +578,10 @@ main_init (struct GNUNET_SERVER_Handle *server,
     {NULL, NULL, 0, 0}
   };
 
-  GSF_core = GNUNET_CORE_connect (GSF_cfg, 1,
-                                  NULL, &peer_init_handler,
-                                  &peer_connect_handler,
-                                  &GSF_peer_disconnect_handler_, NULL,
-                                  GNUNET_NO, NULL, GNUNET_NO, p2p_handlers);
+  GSF_core =
+      GNUNET_CORE_connect (GSF_cfg, NULL, &peer_init_handler,
+                           &peer_connect_handler, &GSF_peer_disconnect_handler_,
+                           NULL, GNUNET_NO, NULL, GNUNET_NO, p2p_handlers);
   if (NULL == GSF_core)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,