log: fix build on osx

we can not assume that the the `rep` type is identical to `time_t` and
`susecond_t`, on osx they are `int`, not `int64_t`. so cast they as
necessary.

this fixes the error and warning of

LogClock.h:112:7: error: non-constant-expression cannot be narrowed from type 'rep' (aka 'long long') to '__darwin_suseconds_t' (aka 'int') in initializer list [-Wc++11-narrowing]
             std::chrono::duration_cast<std::chrono::microseconds>(
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/kefu/dev/ceph/src/log/LogClock.h:112:7: note: insert an explicit cast to silence this issue
             std::chrono::duration_cast<std::chrono::microseconds>(
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LogClock.h:139:46: warning: format specifies type 'long' but the argument has type 'int' [-Wformat]
                      bdt.tm_hour, bdt.tm_min, bdt.tm_sec, tv.tv_usec / 1000);
                                                           ^~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/log/LogClock.h b/src/log/LogClock.h
index 76156b093b401e6b321886b4cc1aba303ab4b900..14bddbd2537b11920c1217a5f007869fc0828951 100644 (file)
--- a/src/log/LogClock.h
+++ b/src/log/LogClock.h
@@ -108,9 +108,9 @@ public:
   static timeval to_timeval(time_point t) {
     auto rep = t.time_since_epoch().count();
     timespan ts(rep.count);
-    return { std::chrono::duration_cast<std::chrono::seconds>(ts).count(),
-            std::chrono::duration_cast<std::chrono::microseconds>(
-              ts % std::chrono::seconds(1)).count() };
+    return { static_cast<time_t>(std::chrono::duration_cast<std::chrono::seconds>(ts).count()),
+             static_cast<suseconds_t>(std::chrono::duration_cast<std::chrono::microseconds>(
+               ts % std::chrono::seconds(1)).count()) };
   }
 private:
   static time_point coarse_now() {
@@ -136,11 +136,13 @@ inline int append_time(const log_time& t, char *out, int outlen) {
   if (coarse) {
     r = std::snprintf(out, outlen, "%04d-%02d-%02d %02d:%02d:%02d.%03ld",
                      bdt.tm_year + 1900, bdt.tm_mon + 1, bdt.tm_mday,
-                     bdt.tm_hour, bdt.tm_min, bdt.tm_sec, tv.tv_usec / 1000);
+                     bdt.tm_hour, bdt.tm_min, bdt.tm_sec,
+                     static_cast<long>(tv.tv_usec / 1000));
   } else {
     r = std::snprintf(out, outlen, "%04d-%02d-%02d %02d:%02d:%02d.%06ld",
                      bdt.tm_year + 1900, bdt.tm_mon + 1, bdt.tm_mday,
-                     bdt.tm_hour, bdt.tm_min, bdt.tm_sec, tv.tv_usec);
+                     bdt.tm_hour, bdt.tm_min, bdt.tm_sec,
+                     static_cast<long>(tv.tv_usec));
   }
   // Since our caller just adds the return value to something without
   // checking it…