[GNUnet-SVN] r24061 - in gnunet/src: arm core fs transport

[gnunet]

Author: grothoff
Date: 2012-09-27 21:14:01 +0200 (Thu, 27 Sep 2012)
New Revision: 24061

Modified:
   gnunet/src/arm/arm_api.c
   gnunet/src/arm/gnunet-service-arm.c
   gnunet/src/core/gnunet-service-core_kx.c
   gnunet/src/fs/gnunet-service-fs_cp.c
   gnunet/src/fs/gnunet-service-fs_pr.c
   gnunet/src/transport/gnunet-transport.c
Log:
-converting more places to use STRINGS_relative_time_to_string

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2012-09-27 19:01:04 UTC (rev 24060)
+++ gnunet/src/arm/arm_api.c    2012-09-27 19:14:01 UTC (rev 24061)
@@ -533,7 +533,7 @@
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Asked to start service `%s' within %s\n", service_name,
-       GNUNET_STRINGS_relative_time_to_string (timeout));
+       GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_NO));
   if (0 == strcasecmp ("arm", service_name))
   {
     slen = strlen ("arm") + 1;
@@ -607,7 +607,7 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG, 
        "Stopping service `%s' within %s\n",
        service_name, 
-       GNUNET_STRINGS_relative_time_to_string (timeout));
+       GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_NO));
   if (h->client == NULL)
   {
     client = GNUNET_CLIENT_connect ("arm", h->cfg);

Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2012-09-27 19:01:04 UTC (rev 24060)
+++ gnunet/src/arm/gnunet-service-arm.c 2012-09-27 19:14:01 UTC (rev 24061)
@@ -983,9 +983,9 @@
       if (0 != pos->killed_at.abs_value)
       {
        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                   _("Service `%s' took %llu ms to terminate\n"),
+                   _("Service `%s' took %s to terminate\n"),
                    pos->name,
-                   GNUNET_TIME_absolute_get_duration 
(pos->killed_at).rel_value);
+                   GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_duration (pos->killed_at), GNUNET_YES));
       }
       GNUNET_OS_process_destroy (pos->proc);
       pos->proc = NULL;

Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c    2012-09-27 19:01:04 UTC (rev 
24060)
+++ gnunet/src/core/gnunet-service-core_kx.c    2012-09-27 19:14:01 UTC (rev 
24061)
@@ -1625,8 +1625,8 @@
       MAX_MESSAGE_AGE.rel_value)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Message received far too old (%llu ms). Content 
ignored.\n"),
-                GNUNET_TIME_absolute_get_duration (t).rel_value);
+                _("Message received far too old (%s). Content ignored.\n"),
+                GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_duration (t), GNUNET_YES));
     GNUNET_STATISTICS_update (GSC_stats,
                               gettext_noop
                               ("# bytes dropped (ancient message)"), size,

Modified: gnunet/src/fs/gnunet-service-fs_cp.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.c        2012-09-27 19:01:04 UTC (rev 
24060)
+++ gnunet/src/fs/gnunet-service-fs_cp.c        2012-09-27 19:14:01 UTC (rev 
24061)
@@ -557,8 +557,9 @@
   struct GSF_PeerTransmitHandle *pth;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Reserved %d bytes / need to wait %llu ms for reservation\n",
-              (int) amount, (unsigned long long) res_delay.rel_value);
+              "Reserved %d bytes / need to wait %s for reservation\n",
+              (int) amount, 
+             GNUNET_STRINGS_relative_time_to_string (res_delay, GNUNET_YES));
   cp->rc = NULL;
   if (0 == amount)
   {
@@ -704,8 +705,9 @@
                             1, GNUNET_NO);
   bt = GNUNET_TIME_relative_ntoh (msm->duration);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Migration of content to peer `%s' blocked for %llu ms\n"),
-              GNUNET_i2s (other), (unsigned long long) bt.rel_value);
+              _("Migration of content to peer `%s' blocked for %s\n"),
+              GNUNET_i2s (other), 
+             GNUNET_STRINGS_relative_time_to_string (bt, GNUNET_YES));
   cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute (bt);
   if (GNUNET_SCHEDULER_NO_TASK == cp->mig_revive_task)
   {
@@ -1702,10 +1704,9 @@
   if (cp->last_migration_block.abs_value > block_time.abs_value)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Migration already blocked for another %llu ms\n",
-                (unsigned long long)
-                GNUNET_TIME_absolute_get_remaining
-                (cp->last_migration_block).rel_value);
+                "Migration already blocked for another %s\n",
+                GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_remaining
+                                                       
(cp->last_migration_block), GNUNET_YES));
     return;                     /* already blocked */
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to stop migration for %llu 
ms\n",

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2012-09-27 19:01:04 UTC (rev 
24060)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2012-09-27 19:14:01 UTC (rev 
24061)
@@ -931,8 +931,8 @@
     if (min_expiration.abs_value > 0)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-                 "Asking to stop migration for %llu ms because datastore is 
full\n",
-                 (unsigned long long) GNUNET_TIME_absolute_get_remaining 
(min_expiration).rel_value);
+                 "Asking to stop migration for %s because datastore is full\n",
+                 GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_remaining (min_expiration), GNUNET_YES));
       GSF_block_peer_migration_ (cp, min_expiration);      
     }
     else
@@ -945,8 +945,8 @@
                                                      
ppd->migration_delay.rel_value);
       ppd->migration_delay = GNUNET_TIME_relative_multiply 
(ppd->migration_delay, 2);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-                 "Replicated content already exists locally, asking to stop 
migration for %llu ms\n",
-                 (unsigned long long) mig_pause.rel_value);
+                 "Replicated content already exists locally, asking to stop 
migration for %s\n",
+                 GNUNET_STRINGS_relative_time_to_string (mig_pause, 
GNUNET_YES));
       GSF_block_peer_migration_ (cp, GNUNET_TIME_relative_to_absolute 
(mig_pause));
     }
   }
@@ -1105,9 +1105,8 @@
   struct GSF_PendingRequest *pr = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              _("Datastore lookup already took %llu ms!\n"),
-              (unsigned long long)
-              GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value);
+              _("Datastore lookup already took %s!\n"),
+              GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_duration (pr->qe_start), GNUNET_YES));
   pr->warn_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &warn_delay_task,
                                     pr);
@@ -1126,9 +1125,8 @@
   struct GSF_PendingRequest *pr = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              _("On-demand lookup already took %llu ms!\n"),
-              (unsigned long long)
-              GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value);
+              _("On-demand lookup already took %s!\n"),
+              GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_duration (pr->qe_start), GNUNET_YES));
   pr->warn_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
                                     &odc_warn_delay_task, pr);

Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2012-09-27 19:01:04 UTC (rev 
24060)
+++ gnunet/src/transport/gnunet-transport.c     2012-09-27 19:14:01 UTC (rev 
24061)
@@ -325,16 +325,17 @@
   if (benchmark_receive)
   {
     duration = GNUNET_TIME_absolute_get_duration (start_time);
-    FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %llu ms)\n"),
+    FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %s)\n"),
              1000 * traffic_received / (1 + duration.rel_value),
-             traffic_received, (unsigned long long) duration.rel_value);
+             traffic_received,
+            GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
   }
   if (benchmark_send)
   {
     duration = GNUNET_TIME_absolute_get_duration (start_time);
-    FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"),
+    FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
              1000 * traffic_sent / (1 + duration.rel_value), traffic_sent,
-             (unsigned long long) duration.rel_value);
+             GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
   }
 }