- fix

[oweals/gnunet.git] / src / nse / gnunet-nse-profiler.c

diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index ac1b6e8bc8e19a441aa5a47c63f091c830d2be70..a10d237918637252dca0fd534b1db6628ab015ed 100644 (file)
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -73,6 +73,11 @@ struct StatsContext
    * How many extra messages per edge (corrections) have been received.
    */
   unsigned long long total_nse_extra;
+
+  /**
+   * How many messages have been discarded.
+   */
+  unsigned long long total_discarded;
 };
 
 
@@ -212,6 +217,12 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     if (pos->nse_handle != NULL)
       GNUNET_NSE_disconnect (pos->nse_handle);
     GNUNET_CONTAINER_DLL_remove (peer_head, peer_tail, pos);
+    if (GNUNET_SCHEDULER_NO_TASK != pos->stats_task)
+    {
+      GNUNET_SCHEDULER_cancel (pos->stats_task);
+      if (NULL != pos->stats)
+        GNUNET_STATISTICS_destroy(pos->stats, GNUNET_NO);
+    }
     GNUNET_free (pos);
   }
 
@@ -308,12 +319,12 @@ static void
 core_get_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct NSEPeer *peer = cls;
-  
-  peer->stats_task = GNUNET_SCHEDULER_NO_TASK;
+
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
   {
     GNUNET_STATISTICS_destroy(peer->stats, GNUNET_NO);
     peer->stats = NULL;
+    return;
   }
   else
   {
@@ -327,6 +338,7 @@ core_get_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                           GNUNET_TIME_UNIT_FOREVER_REL,
                           NULL, &core_stats_iterator, peer);
   }
+  peer->stats_task = GNUNET_SCHEDULER_NO_TASK;
 }
 
 /**
@@ -455,6 +467,17 @@ stats_finished_callback (void *cls, int success)
     }
     GNUNET_free_non_null (buf);
 
+    buf = NULL;
+    buf_len =
+        GNUNET_asprintf (&buf, "TOTAL_NSE_DISCARDED_%d: %u \n",
+                         stats_context->shutdown, 
+                         stats_context->total_discarded);
+    if (buf_len > 0)
+    {
+      GNUNET_DISK_file_write (data_file, buf, buf_len);
+    }
+    GNUNET_free_non_null (buf);
+
   }
 
   if (GNUNET_YES == stats_context->shutdown)
@@ -540,6 +563,10 @@ statistics_iterator (void *cls, const struct GNUNET_PeerIdentity *peer,
     {
       stats_context->total_nse_extra += value;
     }
+    if (0 == strcmp (name, "# flood messages discarded (clock skew too large)"))
+    {
+      stats_context->total_discarded += value;
+    }
   }
   return GNUNET_OK;
 }