format_timespan: work with nsec instead of usec, remove unused USEC_* symbols

Lennart:

  Hmm, let's stick to uint64_t as type in casync, and only deal with ns
  as unit. Patching through format_timespan() fixing up the factor sounds
  easy enough to me. Yes, this means systemd and casync will deviate from
  each other in this case, but I think that's fine, if we do it for a
  reason.

  In casync we mostly deal with ns, since we mostly deal with file system
  objects, and Linux exposes ns granularity for those, hence I think it
  is a good idea to standardize on ns time units. In systemd that's a bit
  different though...

Signed-off-by: Arnaud Rebillout <[email protected]>

Author: elboulangero

src/time-util.c

@@ -6,17 +6,18 @@
 char *format_timespan(char *buf, size_t l, uint64_t t, uint64_t accuracy) {
         static const struct {
                 const char *suffix;
-                uint64_t usec;
+                uint64_t nsec;
         } table[] = {
-                { "y",     USEC_PER_YEAR   },
-                { "month", USEC_PER_MONTH  },
-                { "w",     USEC_PER_WEEK   },
-                { "d",     USEC_PER_DAY    },
-                { "h",     USEC_PER_HOUR   },
-                { "min",   USEC_PER_MINUTE },
-                { "s",     USEC_PER_SEC    },
-                { "ms",    USEC_PER_MSEC   },
-                { "us",    1               },
+                { "y",     NSEC_PER_YEAR   },
+                { "month", NSEC_PER_MONTH  },
+                { "w",     NSEC_PER_WEEK   },
+                { "d",     NSEC_PER_DAY    },
+                { "h",     NSEC_PER_HOUR   },
+                { "min",   NSEC_PER_MINUTE },
+                { "s",     NSEC_PER_SEC    },
+                { "ms",    NSEC_PER_MSEC   },
+                { "us",    NSEC_PER_USEC   },
+                { "ns",    1               },
         };
 
         size_t i;
@@ -26,7 +27,7 @@ char *format_timespan(char *buf, size_t l, uint64_t t, uint64_t accuracy) {
         assert(buf);
         assert(l > 0);
 
-        if (t == USEC_INFINITY) {
+        if (t == NSEC_INFINITY) {
                 strncpy(p, "infinity", l-1);
                 p[l-1] = 0;
                 return p;
@@ -52,22 +53,22 @@ char *format_timespan(char *buf, size_t l, uint64_t t, uint64_t accuracy) {
                 if (t < accuracy && something)
                         break;
 
-                if (t < table[i].usec)
+                if (t < table[i].nsec)
                         continue;
 
                 if (l <= 1)
                         break;
 
-                a = t / table[i].usec;
-                b = t % table[i].usec;
+                a = t / table[i].nsec;
+                b = t % table[i].nsec;
 
                 /* Let's see if we should shows this in dot notation */
-                if (t < USEC_PER_MINUTE && b > 0) {
+                if (t < NSEC_PER_MINUTE && b > 0) {
                         uint64_t cc;
                         signed char j;
 
                         j = 0;
-                        for (cc = table[i].usec; cc > 1; cc /= 10)
+                        for (cc = table[i].nsec; cc > 1; cc /= 10)
                                 j++;
 
                         for (cc = accuracy; cc > 1; cc /= 10) {

src/time-util.h

@@ -3,27 +3,17 @@
 #ifndef footimeutilfoo
 #define footimeutilfoo
 
-#define USEC_INFINITY ((uint64_t) -1)
 #define NSEC_INFINITY ((uint64_t) -1)
 
-#define MSEC_PER_SEC  1000ULL
-#define USEC_PER_SEC  ((uint64_t) 1000000ULL)
-#define USEC_PER_MSEC ((uint64_t) 1000ULL)
 //#define NSEC_PER_SEC  ((uint64_t) 1000000000ULL) already defined in util.h
 #define NSEC_PER_MSEC ((uint64_t) 1000000ULL)
 #define NSEC_PER_USEC ((uint64_t) 1000ULL)
 
-#define USEC_PER_MINUTE ((uint64_t) (60ULL*USEC_PER_SEC))
 #define NSEC_PER_MINUTE ((uint64_t) (60ULL*NSEC_PER_SEC))
-#define USEC_PER_HOUR ((uint64_t) (60ULL*USEC_PER_MINUTE))
 #define NSEC_PER_HOUR ((uint64_t) (60ULL*NSEC_PER_MINUTE))
-#define USEC_PER_DAY ((uint64_t) (24ULL*USEC_PER_HOUR))
 #define NSEC_PER_DAY ((uint64_t) (24ULL*NSEC_PER_HOUR))
-#define USEC_PER_WEEK ((uint64_t) (7ULL*USEC_PER_DAY))
 #define NSEC_PER_WEEK ((uint64_t) (7ULL*NSEC_PER_DAY))
-#define USEC_PER_MONTH ((uint64_t) (2629800ULL*USEC_PER_SEC))
 #define NSEC_PER_MONTH ((uint64_t) (2629800ULL*NSEC_PER_SEC))
-#define USEC_PER_YEAR ((uint64_t) (31557600ULL*USEC_PER_SEC))
 #define NSEC_PER_YEAR ((uint64_t) (31557600ULL*NSEC_PER_SEC))
 
 char *format_timespan(char *buf, size_t l, uint64_t t, uint64_t accuracy);