misc fixes

3 files changed, 47 insertions, 40 deletions

diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c
index 61aca6b18..6e8e3bd13 100644
--- a/src/ats-tests/ats-testing-log.c
+++ b/src/ats-tests/ats-testing-log.c
@@ -693,7 +693,7 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l)
      else
      {
        mlt->total_throughput_send = mult * mlt->total_bytes_sent;
-       mlt->total_throughput_send = mult * mlt->total_bytes_received;
+       mlt->total_throughput_recv = mult * mlt->total_bytes_received;
      }
 
     if (GNUNET_YES == l->verbose)
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index 27850e3e7..f624c2b21 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -57,10 +57,12 @@ static int opt_plot;
  */
 static int opt_verbose;
 
-struct GNUNET_SCHEDULER_Task * timeout_task;
+static struct GNUNET_SCHEDULER_Task *timeout_task;
+
+static struct Experiment *e;
+
+static struct LoggingHandle *l;
 
-struct Experiment *e;
-struct LoggingHandle *l;
 
 static void
 evaluate (struct GNUNET_TIME_Relative duration_total)
@@ -125,11 +127,16 @@ evaluate (struct GNUNET_TIME_Relative duration_total)
   }
 }
 
+
 static void
-do_shutdown ()
+do_shutdown (void *cls)
 {
   fprintf (stderr, "Shutdown\n");
-  /* timeout */
+  if (NULL != timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = NULL;
+  }
   if (NULL != l)
   {
     GNUNET_ATS_TEST_logging_stop (l);
@@ -153,9 +160,17 @@ do_shutdown ()
 
 
 static void
+do_timeout (void *cls)
+{
+  timeout_task = NULL;
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+static void
 transport_recv_cb (void *cls,
-                   const struct GNUNET_PeerIdentity * peer,
-                   const struct GNUNET_MessageHeader * message)
+                   const struct GNUNET_PeerIdentity *peer,
+                   const struct GNUNET_MessageHeader *message)
 {
 
 }
@@ -175,19 +190,19 @@ log_request__cb (void *cls, const struct GNUNET_HELLO_Address *address,
 
 }
 
+
 static void
-experiment_done_cb (struct Experiment *e, struct GNUNET_TIME_Relative duration,int success)
+experiment_done_cb (struct Experiment *e,
+                    struct GNUNET_TIME_Relative duration,int success)
 {
   if (GNUNET_OK == success)
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment done successful in %s\n",
-        GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Experiment done successful in %s\n",
+                GNUNET_STRINGS_relative_time_to_string (duration,
+                                                        GNUNET_YES));
   else
     GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment failed \n");
-  if (NULL != timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = NULL;
-  }
+
   /* Stop logging */
   GNUNET_ATS_TEST_logging_stop (l);
 
@@ -200,31 +215,20 @@ experiment_done_cb (struct Experiment *e, struct GNUNET_TIME_Relative duration,i
   evaluate (duration);
   if (opt_log)
     GNUNET_ATS_TEST_logging_write_to_file(l, opt_exp_file, opt_plot);
-
-  if (NULL != l)
-  {
-    GNUNET_ATS_TEST_logging_stop (l);
-    GNUNET_ATS_TEST_logging_clean_up (l);
-    l = NULL;
-  }
-
-  /* Clean up experiment */
-  GNUNET_ATS_TEST_experimentation_stop (e);
-  e = NULL;
-
-  /* Shutdown topology */
-  GNUNET_ATS_TEST_shutdown_topology ();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 static void
 episode_done_cb (struct Episode *ep)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Episode %u done\n", ep->id);
 }
 
+
 static void topology_setup_done (void *cls,
-    struct BenchmarkPeer *masters,
-    struct BenchmarkPeer *slaves)
+                                 struct BenchmarkPeer *masters,
+                                 struct BenchmarkPeer *slaves)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Topology setup complete!\n");
 
@@ -309,10 +313,15 @@ static void topology_setup_done (void *cls,
   }
 #endif
 
-  timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_add (GNUNET_TIME_UNIT_MINUTES,
-      e->max_duration), &do_shutdown, NULL);
+  timeout_task
+    = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_add (GNUNET_TIME_UNIT_MINUTES,
+                                                              e->max_duration),
+                                    &do_timeout,
+                                    NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
 }
 
+
 static void
 parse_args (int argc, char *argv[])
 {
@@ -325,6 +334,7 @@ parse_args (int argc, char *argv[])
   {
     if ((c < (argc - 1)) && (0 == strcmp (argv[c], "-e")))
     {
+      GNUNET_free_non_null (opt_exp_file);
       opt_exp_file = GNUNET_strdup ( argv[c + 1]);
     }
     if (0 == strcmp (argv[c], "-l"))
@@ -342,6 +352,7 @@ parse_args (int argc, char *argv[])
   }
 }
 
+
 int
 main (int argc, char *argv[])
 {
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index 0e4056a6c..a7c1dc3bf 100644
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -137,14 +137,12 @@ evaluate ()
   double kb_recv_percent;
   unsigned int rtt;
 
-  duration = (perf_duration.rel_value_us / (1000 * 1000));
+  duration = 1 + (perf_duration.rel_value_us / (1000 * 1000));
   for (c_m = 0; c_m < num_masters; c_m++)
   {
     mp = &mps[c_m];
-    if (NULL == mp)
-      continue;
     fprintf (stderr,
-        _("Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. = %u KiB/s\n"),
+             "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. = %u KiB/s\n",
         mp->no, mp->total_bytes_sent / 1024, duration,
         (mp->total_bytes_sent / 1024) / duration,
         mp->total_bytes_received / 1024, duration,
@@ -153,8 +151,6 @@ evaluate ()
     for (c_s = 0; c_s < num_slaves; c_s++)
     {
       p = &mp->partners[c_s];
-      if (NULL == p)
-        continue;
       kb_sent_sec = 0;
       kb_recv_sec = 0;
       kb_sent_percent = 0.0;