[GNUnet-SVN] r32657 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2014-03-17 12:02:27 +0100 (Mon, 17 Mar 2014)
New Revision: 32657

Modified:
   gnunet/src/mesh/gnunet-mesh-profiler.c
Log:
- log, debug

Modified: gnunet/src/mesh/gnunet-mesh-profiler.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh-profiler.c      2014-03-17 11:02:26 UTC (rev 
32656)
+++ gnunet/src/mesh/gnunet-mesh-profiler.c      2014-03-17 11:02:27 UTC (rev 
32657)
@@ -379,6 +379,7 @@
 
   GNUNET_assert (target <= TOTAL_PEERS);
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "adjust peers to %u\n", target);
   if (target > peers_running)
   {
     delta = target - peers_running;
@@ -411,7 +412,7 @@
  * @param tc Task context.
  */
 static void
-next_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+next_rnd (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   long round = (long) cls;
 
@@ -421,12 +422,13 @@
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ROUND %ld\n", round);
   if (0.0 == rounds[round])
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Finishing\n");
     GNUNET_SCHEDULER_add_now (&finish_profiler, NULL);
     return;
   }
   adjust_running_peers (rounds[round] * TOTAL_PEERS);
 
-  GNUNET_SCHEDULER_add_delayed (ROUND_TIME, &next_round, (void *) (round + 1));
+  GNUNET_SCHEDULER_add_delayed (ROUND_TIME, &next_rnd, (void *) (round + 1));
 }
 
 
@@ -578,8 +580,9 @@
 
   GNUNET_break (0 != peer->timestamp.abs_value_us);
   latency = GNUNET_TIME_absolute_get_duration (peer->timestamp);
-  FPRINTF (stderr, "%ld latency: %s\n",
-           n, GNUNET_STRINGS_relative_time_to_string (latency, GNUNET_NO));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u <- %u latency: %s\n",
+              get_index (peer), get_index (peer->dest),
+              GNUNET_STRINGS_relative_time_to_string (latency, GNUNET_NO));
 
   if (GNUNET_SCHEDULER_NO_TASK == peer->ping_task)
   {
@@ -724,7 +727,7 @@
                                                        &ping, &peers[i]);
   }
   peers_running = TOTAL_PEERS;
-  GNUNET_SCHEDULER_add_delayed (ROUND_TIME, &next_round, NULL);
+  GNUNET_SCHEDULER_add_delayed (ROUND_TIME, &next_rnd, NULL);
 }