X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fstd-formats.c;h=bfe9844c832f5bd0707ef39ccd78303606f6d0c7;hb=c428fd5d9476baba02edc0a10552719460e85b1e;hp=421cb3dda99b19d0e035762c084c649d5da4ac13;hpb=e6387b2b9fdaca33d50c1074dda5d41e1092e8ad;p=vpp.git

diff --git a/src/vppinfra/std-formats.c b/src/vppinfra/std-formats.c
index 421cb3dda99..bfe9844c832 100644
--- a/src/vppinfra/std-formats.c
+++ b/src/vppinfra/std-formats.c
@@ -134,6 +134,52 @@ format_white_space (u8 * s, va_list * va)
   return s;
 }
 
+u8 *
+format_duration (u8 *s, va_list *args)
+{
+  f64 t = va_arg (*args, f64);
+  s = format (s, "");
+
+  const f64 seconds_per_minute = 60;
+  const f64 seconds_per_hour = 60 * seconds_per_minute;
+  const f64 seconds_per_day = 24 * seconds_per_hour;
+  uword days, hours, minutes, secs, msecs, usecs;
+
+  days = t / seconds_per_day;
+  t -= days * seconds_per_day;
+
+  hours = t / seconds_per_hour;
+  t -= hours * seconds_per_hour;
+
+  minutes = t / seconds_per_minute;
+  t -= minutes * seconds_per_minute;
+
+  secs = t;
+  t -= secs;
+
+  msecs = 1e3 * t;
+
+  usecs = 1e6 * t;
+  usecs = usecs % 1000;
+
+  if (t == 0.)
+    s = format (s, "0");
+  if (days)
+    s = format (s, "%ddays ", days);
+  if (hours)
+    s = format (s, "%dh ", hours);
+  if (minutes)
+    s = format (s, "%dmin ", minutes);
+  if (secs)
+    s = format (s, "%ds ", secs);
+  if (msecs)
+    s = format (s, "%dms ", msecs);
+  if (usecs)
+    s = format (s, "%dus", usecs);
+
+  return (s);
+}
+
 u8 *
 format_time_interval (u8 * s, va_list * args)
 {
@@ -208,7 +254,7 @@ format_time_interval (u8 * s, va_list * args)
 __clib_export u8 *
 format_base10 (u8 *s, va_list *va)
 {
-  uword size = va_arg (*va, uword);
+  u64 size = va_arg (*va, u64);
 
   if (size < 1000)
     s = format (s, "%d", size);
@@ -350,8 +396,6 @@ format_c_identifier (u8 * s, va_list * va)
   uword i, l;
 
   l = ~0;
-  if (clib_mem_is_vec (id))
-    l = vec_len (id);
 
   if (id)
     for (i = 0; i < l && id[i] != 0; i++)