Commit cc8651fc authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge remote-tracking branch 'simplepi/master'

parents 88b62145 4542717c

src/fnordmetric/sql/svalue.cc

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ bool SValue::tryTimeConversion() { 
  time_t ts = getInteger();

  data_.type = T_TIMESTAMP;

  // FIXPAUL take a smart guess if this is milli, micro, etc

  data_.u.t_timestamp = ts * 1000000;

  data_.u.t_timestamp = ts * 1000000llu;

  return true;

}

src/libfnord/fnord-base/wallclock.cc

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ uint64_t WallClock::unixMillis() { 
  struct timeval tv;



  gettimeofday(&tv, NULL);

  return tv.tv_sec * 1000u + tv.tv_usec / 1000u;

  return tv.tv_sec * 1000llu + tv.tv_usec / 1000llu;

}



uint64_t WallClock::getUnixMicros() {
@@ -42,7 +42,7 @@ uint64_t WallClock::unixMicros() { 
  struct timeval tv;



  gettimeofday(&tv, NULL);

  return tv.tv_sec * 1000000u + tv.tv_usec;

  return tv.tv_sec * 1000000llu + tv.tv_usec;

}



}

CRA Git | Maintained and supported by SUSTech CRA and CCSE