ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 22:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

monotonicCurrentTimeInSeconds should return seconds, not milliseconds

Browse Source
This commit is contained in:
Patrick Dehne
2013-10-21 00:11:44 +02:00
parent fae7082049
commit ef1e2f8595
1 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/beast/beast/chrono/impl/RelativeTime.cpp
View File

@@ -267,32 +267,51 @@ namespace detail {
double monotonicCurrentTimeInSeconds()
{
return (uint32) GetTickCount64();
return (uint32) GetTickCount64() / 1000.0;
}
#elif BEAST_MAC || BEAST_IOS
#include <time.h>
static double timebaseRatio()
{
struct TimebaseRatio
{
TimebaseRatio ()
{
uint64 numerator;
double denominator;
mach_timebase_info_data_t timebase;
(void) mach_timebase_info (&timebase);
if (timebase.numer % 1000000 == 0)
{
numerator = timebase.numer / 1000000;
denominator = timebase.denom * 1000.0;
}
else
{
numerator = timebase.numer;
denominator = timebase.denom * (uint64) 1000000 * 1000.0;
}
ratio = numerator / denominator;
}
double ratio;
};
static TimebaseRatio timebaseRatio;
return timebaseRatio.ratio;
}
double monotonicCurrentTimeInSeconds()
{
uint64 numerator, denominator;
mach_timebase_info_data_t timebase;
(void) mach_timebase_info (&timebase);
if (timebase.numer % 1000000 == 0)
{
numerator = timebase.numer / 1000000;
denominator = timebase.denom;
}
else
{
numerator = timebase.numer;
denominator = timebase.denom * (uint64) 1000000;
}
return (uint32) ((mach_absolute_time() * numerator) / denominator);
return mach_absolute_time() * timebaseRatio();
}
#else
@@ -303,7 +322,7 @@ double monotonicCurrentTimeInSeconds()
{
timespec t;
clock_gettime (CLOCK_MONOTONIC, &t);
return t.tv_sec * 1000 + t.tv_nsec / 1000000;
return t.tv_sec + t.tv_nsec / 1000000000.0;
}
#endif