7 files changed, 135 insertions, 86 deletions

diff --git a/src/ats/gnunet-service-ats-solver_mlp.c b/src/ats/gnunet-service-ats-solver_mlp.c
index 84cacd017..93c6839f8 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.c
+++ b/src/ats/gnunet-service-ats-solver_mlp.c
@@ -1078,7 +1078,7 @@ GAS_mlp_solve_problem (void *solver)
         else
         {
                         LOG (GNUNET_ERROR_TYPE_DEBUG, "Problem was updated, resolving\n");
-                        duration_build.rel_value = 0;
+                        duration_build.rel_value_us = 0;
         }
 
         /* Run LP solver */
@@ -1107,10 +1107,15 @@ GAS_mlp_solve_problem (void *solver)
         mlp->ps.p_rows = glp_get_num_rows (mlp->p.prob);
         mlp->ps.p_elements = mlp->p.num_elements;
 
-        LOG (GNUNET_ERROR_TYPE_DEBUG, "Execution time: Build %llu ms, LP %llu ms,  MLP %llu ms\n",
-                        (unsigned long long) duration_build.rel_value,
-                        (unsigned long long) duration_lp.rel_value,
-                        (unsigned long long) duration_mlp.rel_value);
+        LOG (GNUNET_ERROR_TYPE_DEBUG, 
+             "Execution time: Build %s\n",
+             GNUNET_STRINGS_relative_time_to_string (duration_build, GNUNET_NO));
+        LOG (GNUNET_ERROR_TYPE_DEBUG, 
+             "Execution time: LP %s\n",
+             GNUNET_STRINGS_relative_time_to_string (duration_lp, GNUNET_NO));
+        LOG (GNUNET_ERROR_TYPE_DEBUG, 
+             "Execution time: MLP %s\n",
+             GNUNET_STRINGS_relative_time_to_string (duration_mlp, GNUNET_NO));
 
         /* Propagate result*/
         if ((GNUNET_OK == res_lp) && (GNUNET_OK == res_mip))
@@ -1120,7 +1125,7 @@ GAS_mlp_solve_problem (void *solver)
         if (GNUNET_YES == mlp->write_mip_mps)
         {
                 /* Write problem to disk */
-                GNUNET_asprintf (&filename, "problem_p_%u_a%u_%llu.mps", mlp->p.num_peers, mlp->p.num_addresses, time.abs_value);
+                GNUNET_asprintf (&filename, "problem_p_%u_a%u_%llu.mps", mlp->p.num_peers, mlp->p.num_addresses, time.abs_value_us);
                 LOG (GNUNET_ERROR_TYPE_ERROR, "DUMP: %s \n", filename);
                 glp_write_lp(mlp->p.prob, NULL, filename);
                 GNUNET_free (filename);
@@ -1128,7 +1133,7 @@ GAS_mlp_solve_problem (void *solver)
         if (GNUNET_YES == mlp->write_mip_sol)
         {
                 /* Write solution to disk */
-                GNUNET_asprintf (&filename, "problem_p_%u_a%u_%llu.sol", mlp->p.num_peers, mlp->p.num_addresses, time.abs_value);
+                GNUNET_asprintf (&filename, "problem_p_%u_a%u_%llu.sol", mlp->p.num_peers, mlp->p.num_addresses, time.abs_value_us);
                 glp_print_mip (mlp->p.prob, filename );
                 LOG (GNUNET_ERROR_TYPE_ERROR, "DUMP: %s \n", filename);
                 GNUNET_free (filename);
@@ -1965,7 +1970,7 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
   mlp->control_param_lp.msg_lev = GLP_MSG_ALL;
 #endif
   mlp->control_param_lp.it_lim = max_iterations;
-  mlp->control_param_lp.tm_lim = max_duration.rel_value;
+  mlp->control_param_lp.tm_lim = max_duration.rel_value_us / 1000LL;
 
   /* Init MLP solving parameters */
   glp_init_iocp(&mlp->control_param_mlp);
@@ -1973,7 +1978,7 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
 #if VERBOSE_GLPK
   mlp->control_param_mlp.msg_lev = GLP_MSG_ALL;
 #endif
-  mlp->control_param_mlp.tm_lim = max_duration.rel_value;
+  mlp->control_param_mlp.tm_lim = max_duration.rel_value_us / 1000LL;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "solver ready\n");
 
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index a48714855..1a1d5cad4 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -596,13 +596,14 @@ find_best_address_it (void *cls, const struct GNUNET_HashCode * key, void *value
 
   now = GNUNET_TIME_absolute_get();
 
-  if (current->blocked_until.abs_value == GNUNET_TIME_absolute_max (now, current->blocked_until).abs_value)
+  if (current->blocked_until.abs_value_us == GNUNET_TIME_absolute_max (now, current->blocked_until).abs_value_us)
   {
     /* This address is blocked for suggestion */
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-                "Address %p blocked for suggestion for %llu ms \n",
-                current,
-                GNUNET_TIME_absolute_get_difference(now, current->blocked_until).rel_value);
+         "Address %p blocked for suggestion for %s \n",
+         current,
+         GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_difference (now, current->blocked_until),
+                                                 GNUNET_YES));
     return GNUNET_OK;
   }
   if (GNUNET_NO == is_bandwidth_available_in_network (net))
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 4164e5f0d..f0986959c 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -582,7 +582,7 @@ GAS_handle_reservation_request (void *cls, struct GNUNET_SERVER_Client *client,
               "RESERVATION_REQUEST");
   amount = (int32_t) ntohl (msg->amount);
   res_delay = GAS_reservations_reserve (&msg->peer, amount);
-  if (res_delay.rel_value > 0)
+  if (res_delay.rel_value_us > 0)
     amount = 0;
   result.header.size = htons (sizeof (struct ReservationResultMessage));
   result.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT);
diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index 3354c4e41..0b4948576 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -63,11 +63,13 @@ GAS_reservations_reserve (const struct GNUNET_PeerIdentity *peer,
   if (amount >= 0)
   {
     ret = GNUNET_BANDWIDTH_tracker_get_delay (tracker, amount);
-    if (ret.rel_value > 0)
+    if (ret.rel_value_us > 0)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Delay to satisfy reservation for %d bytes is %llu ms\n",
-                  (int) amount, (unsigned long long) ret.rel_value);
+                  "Delay to satisfy reservation for %d bytes is %s\n",
+                  (int) amount,
+                  GNUNET_STRINGS_relative_time_to_string (ret,
+                                                          GNUNET_YES));
       return ret;
     }
   }
diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c
index ada67fc94..5d370104b 100644
--- a/src/ats/perf_ats_mlp.c
+++ b/src/ats/perf_ats_mlp.c
@@ -366,39 +366,51 @@ check (void *cls, char *const *args, const char *cfgfile,
                                 }
                                 if (GNUNET_NO == opt_numeric)
                                 {
-                                fprintf (stderr, "Rebuild: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in ms) %04llu / %04llu / %04llu\n",
-                                                cp + 1, ca,
-                                                (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
-                                                (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
-                                                (GLP_YES == full_lp_presolv) ? "YES" : "NO",
-                                                (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
-                                                (unsigned long long) full_build_dur.rel_value, (unsigned long long) full_lp_dur.rel_value, (unsigned long long) full_mip_dur.rel_value);
+                                fprintf (stderr,
+                                         "Rebuild: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in us) %04llu / %04llu / %04llu\n",
+                                         cp + 1, ca,
+                                         (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
+                                         (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
+                                         (GLP_YES == full_lp_presolv) ? "YES" : "NO",
+                                         (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
+                                         (unsigned long long) full_build_dur.rel_value_us,
+                                         (unsigned long long) full_lp_dur.rel_value_us, 
+                                         (unsigned long long) full_mip_dur.rel_value_us);
                                 if ((0 < opt_update_quantity) || (0 < opt_update_percent))
-                                        fprintf (stderr, "Update : %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in ms) %04llu / %04llu / %04llu\n",
-                                                cp + 1, ca,
-                                                (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
-                                                (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
-                                                (GLP_YES == update_lp_presolv) ? "YES" : "NO",
-                                                (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
-                                                (unsigned long long) update_build_dur.rel_value, (unsigned long long) update_lp_dur.rel_value, (unsigned long long) update_mip_dur.rel_value);
+                                  fprintf (stderr, 
+                                           "Update: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in us) %04llu / %04llu / %04llu\n",
+                                           cp + 1, ca,
+                                           (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
+                                           (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
+                                           (GLP_YES == update_lp_presolv) ? "YES" : "NO",
+                                           (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
+                                           (unsigned long long) update_build_dur.rel_value_us,
+                                           (unsigned long long) update_lp_dur.rel_value_us, 
+                                           (unsigned long long) update_mip_dur.rel_value_us);
                                 }
                                 else
                                 {
-                                                fprintf (stderr, "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
-                                                                cp + 1, ca,
-                                                                (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
-                                                                (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
-                                                                (GLP_YES == full_lp_presolv) ? "YES" : "NO",
-                                                                (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
-                                                                (unsigned long long) full_build_dur.rel_value, (unsigned long long) full_lp_dur.rel_value, (unsigned long long) full_mip_dur.rel_value);
-                                                if ((0 < opt_update_quantity) || (0 < opt_update_percent))
-                                                        fprintf (stderr, "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
-                                                                        cp + 1, ca,
-                                                                        (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
-                                                                        (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
-                                                                        (GLP_YES == update_lp_presolv) ? "YES" : "NO",
-                                                                        (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
-                                                                        (unsigned long long) update_build_dur.rel_value, (unsigned long long) update_lp_dur.rel_value, (unsigned long long) update_mip_dur.rel_value);
+                                  fprintf (stderr, 
+                                           "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
+                                           cp + 1, ca,
+                                           (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
+                                           (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
+                                           (GLP_YES == full_lp_presolv) ? "YES" : "NO",
+                                           (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
+                                           (unsigned long long) full_build_dur.rel_value_us, 
+                                           (unsigned long long) full_lp_dur.rel_value_us, 
+                                           (unsigned long long) full_mip_dur.rel_value_us);
+                                  if ((0 < opt_update_quantity) || (0 < opt_update_percent))
+                                    fprintf (stderr, 
+                                             "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
+                                             cp + 1, ca,
+                                             (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
+                                             (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
+                                             (GLP_YES == update_lp_presolv) ? "YES" : "NO",
+                                             (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
+                                             (unsigned long long) update_build_dur.rel_value_us, 
+                                             (unsigned long long) update_lp_dur.rel_value_us, 
+                                             (unsigned long long) update_mip_dur.rel_value_us);
                                 }
                         }
         }
diff --git a/src/ats/test_ats_api_scheduling_block_and_reset.c b/src/ats/test_ats_api_scheduling_block_and_reset.c
index b799a5de3..d5bd58031 100644
--- a/src/ats/test_ats_api_scheduling_block_and_reset.c
+++ b/src/ats/test_ats_api_scheduling_block_and_reset.c
@@ -150,44 +150,48 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
   if (3 == stage)
   {
       /* Suggestion after resetting block interval */
-      reset_block_duration = GNUNET_TIME_absolute_get_difference(reset_block_start, GNUNET_TIME_absolute_get());
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion after resetting blocking took about %llu ms!\n",
-                  (long long unsigned int) reset_block_duration.rel_value);
-      if ((block_duration.rel_value <= (initial_duration.rel_value * 3)) ||
-          (initial_duration.rel_value <= (block_duration.rel_value * 3)))
+      reset_block_duration = GNUNET_TIME_absolute_get_difference (reset_block_start, 
+                                                                  GNUNET_TIME_absolute_get());
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Address suggestion after resetting blocking took about %s!\n",
+                  GNUNET_STRINGS_relative_time_to_string (reset_block_duration,
+                                                          GNUNET_YES));
+      if ((block_duration.rel_value_us <= (initial_duration.rel_value_us * 3)) ||
+          (initial_duration.rel_value_us <= (block_duration.rel_value_us * 3)))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Address suggestion after resetting blocking (%llu ms) took about the same as initial suggestion (%llu ms)\n",
-                    (long long unsigned int) reset_block_duration.rel_value,
-                    (long long unsigned int) initial_duration.rel_value);
+                    "Address suggestion after resetting blocking took about the same as initial suggestion (%s)\n",
+                    GNUNET_STRINGS_relative_time_to_string (initial_duration,
+                                                            GNUNET_YES));
         ret = 0;
       }
       else
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address suggestion after resetting blocking (%llu ms) has too big difference to initial suggestion (%llu ms)\n",
-                    (long long unsigned int) reset_block_duration.rel_value,
-                    (long long unsigned int) initial_duration.rel_value);
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Address suggestion after resetting blocking has too big difference to initial suggestion (%s)\n",
+                    GNUNET_STRINGS_relative_time_to_string (initial_duration,
+                                                            GNUNET_YES));
         ret = 1;
         GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
         GNUNET_SCHEDULER_add_now (&end, NULL);
         return;
       }
 
-      if (((initial_duration.rel_value * 3) <= block_duration.rel_value ) &&
-          ((reset_block_duration.rel_value * 3) <= block_duration.rel_value))
+      if (((initial_duration.rel_value_us * 3) <= block_duration.rel_value_us) &&
+          ((reset_block_duration.rel_value_us * 3) <= block_duration.rel_value_us))
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion after resetting blocking (%llu ms) and initial suggestion (%llu ms) much faster than with blocking (%llu ms)\n",
-                    (long long unsigned int) reset_block_duration.rel_value,
-                    (long long unsigned int) initial_duration.rel_value,
-                    (long long unsigned int) block_duration.rel_value);
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+                    "Address suggestion after resetting blocking and initial suggestion (%llu us) much faster than with blocking (%llu us)\n",
+                    (unsigned long long) initial_duration.rel_value_us,
+                    (unsigned long long) block_duration.rel_value_us);
         ret = 0;
       }
       else
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address suggestion after resetting blocking (%llu ms) and initial suggestion (%llu ms) not faster than with blocking (%llu ms)\n",
-                    (long long unsigned int) reset_block_duration.rel_value,
-                    (long long unsigned int) initial_duration.rel_value,
-                    (long long unsigned int) block_duration.rel_value);
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                    "Address suggestion after resetting blocking and initial suggestion (%llu us) not faster than with blocking (%llu us)\n",
+                    (unsigned long long) initial_duration.rel_value_us,
+                    (unsigned long long) block_duration.rel_value_us);
         ret = 1;
       }
 
@@ -200,18 +204,22 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
   {
       /* Suggestion after block*/
       block_duration = GNUNET_TIME_absolute_get_difference(block_start, GNUNET_TIME_absolute_get());
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion was blocked for about %llu ms!\n",
-                  (long long unsigned int) block_duration.rel_value);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Address suggestion was blocked for about %s!\n",
+                  GNUNET_STRINGS_relative_time_to_string (block_duration,
+                                                          GNUNET_YES));
 
       if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
       {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with correct address `%s'\n", stage,
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                      "Stage %u: Callback with correct address `%s'\n", stage,
                       GNUNET_i2s (&address->peer));
           ret = 0;
       }
       else
       {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with invalid address `%s'\n", stage,
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Stage %u: Callback with invalid address `%s'\n", stage,
                       GNUNET_i2s (&address->peer));
           GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
           GNUNET_SCHEDULER_add_now (&end, NULL);
@@ -220,7 +228,8 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
 
       if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect ats info \n");
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                    "Stage %u: Callback with incorrect ats info \n");
         GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
         GNUNET_SCHEDULER_add_now (&end, NULL);
         ret = 1;
@@ -237,13 +246,17 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
     /* Initial suggestion */
     if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with correct address `%s'\n", stage,
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                    "Stage %u: Callback with correct address `%s'\n", 
+                    stage,
                     GNUNET_i2s (&address->peer));
         ret = 0;
     }
     else
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with invalid address `%s'\n", stage,
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                    "Stage %u: Callback with invalid address `%s'\n", 
+                    stage,
                     GNUNET_i2s (&address->peer));
         GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
         GNUNET_SCHEDULER_add_now (&end, NULL);
@@ -252,15 +265,20 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
 
     if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect ats info \n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                  "Stage %u: Callback with incorrect ats info\n",
+                  stage);
       GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
       GNUNET_SCHEDULER_add_now (&end, NULL);
       ret = 1;
     }
-    stage ++;
+    stage++;
     initial_duration = GNUNET_TIME_absolute_get_difference(initial_start, GNUNET_TIME_absolute_get());
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Initial suggestion took about %llu ms\n", stage,
-                (long long unsigned int) block_duration.rel_value);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+                "Stage %u: Initial suggestion took about %s\n", 
+                stage,
+                GNUNET_STRINGS_relative_time_to_string (block_duration,
+                                                        GNUNET_YES));
 
     block_start = GNUNET_TIME_absolute_get();
     wait_task = GNUNET_SCHEDULER_add_delayed (WAIT, &request_task, NULL);
@@ -270,22 +288,28 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
     /* Startup suggestion */
     if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with correct address `%s'\n", stage,
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                    "Stage %u: Callback with correct address `%s'\n", 
+                    stage,
                     GNUNET_i2s (&address->peer));
         ret = 0;
     }
     else
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with invalid address `%s'\n", stage,
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Stage %u: Callback with invalid address `%s'\n", 
+                    stage,
                     GNUNET_i2s (&address->peer));
         GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
         GNUNET_SCHEDULER_add_now (&end, NULL);
         ret = 1;
     }
 
-    if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
+    if (GNUNET_OK != compare_ats (atsi, ats_count, test_ats_info, test_ats_count))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect ats info \n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                  "Stage %u: Callback with incorrect ats info\n",
+                  stage);
       GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
       GNUNET_SCHEDULER_add_now (&end, NULL);
       ret = 1;
@@ -312,7 +336,8 @@ run (void *cls,
   sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
   if (sched_ats == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "Could not connect to ATS scheduling!\n");
     ret = 1;
     end ();
     return;
@@ -321,14 +346,16 @@ run (void *cls,
   /* Set up peer */
   if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.id.hashPubKey))
   {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Could not setup peer!\n");
       ret = GNUNET_SYSERR;
       end ();
       return;
   }
   GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Created peer `%s'\n",
               GNUNET_i2s_full(&p.id));
 
   /* Prepare ATS Information */
diff --git a/src/ats/test_ats_api_scheduling_init.c b/src/ats/test_ats_api_scheduling_init.c
index bd96a4df7..6d6505100 100644
--- a/src/ats/test_ats_api_scheduling_init.c
+++ b/src/ats/test_ats_api_scheduling_init.c
@@ -123,7 +123,9 @@ run (void *cls,
     end_badly_now ();
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting for %llu sec\n", (long long unsigned int) DELAY.rel_value);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting for %s\n", 
+              GNUNET_STRINGS_relative_time_to_string (DELAY,
+                                                      GNUNET_YES));
   wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &delay, NULL);
 }