Merge #17800: random: don't special case clock usage on macOS
dc9305b616random: don't special case clock usage on macOS (fanquake) Pull request description: `clock_gettime()`, `CLOCK_MONOTONIC` and `CLOCK_REALTIME` are all available for use on macOS (now that we require macOS >=10.12 and build against 10.14). Use them rather than the [deprecated](https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/KernelProgramming/Mach/Mach.html) `mach_timespec_t` time API. I mentioned the possibility for this change [in #17270](https://github.com/bitcoin/bitcoin/pull/17270#discussion_r346090606). [master](1dbf3350c6): ```bash 2019-12-23T20:49:43Z Feeding 216 bytes of dynamic environment data into RNG 2019-12-23T20:50:43Z Feeding 216 bytes of dynamic environment data into RNG ``` This PR: ```bash 2019-12-23T20:32:41Z Feeding 232 bytes of dynamic environment data into RNG 2019-12-23T20:33:42Z Feeding 232 bytes of dynamic environment data into RNG ``` ~~Depends on #16392.~~ Merged. ACKs for top commit: laanwj: ACKdc9305b616Tree-SHA512: 18c2f336ea628f9cf7339b817381d230a18893fd9c0351bf99a39ca6f45c5b0a20af9d599d48d6c09515627d5edafa91337c17f9f790264251d2cdcb3763bbd5
This commit is contained in:
1 file changed
-14
@@ -237,8 +237,6 @@ void RandAddDynamicEnv(CSHA512& hasher)
|
|||||||
GetSystemTimeAsFileTime(&ftime);
|
GetSystemTimeAsFileTime(&ftime);
|
||||||
hasher << ftime;
|
hasher << ftime;
|
||||||
#else
|
#else
|
||||||
# ifndef __MACH__
|
|
||||||
// On non-MacOS systems, use various clock_gettime() calls.
|
|
||||||
struct timespec ts = {};
|
struct timespec ts = {};
|
||||||
# ifdef CLOCK_MONOTONIC
|
# ifdef CLOCK_MONOTONIC
|
||||||
clock_gettime(CLOCK_MONOTONIC, &ts);
|
clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||||
@@ -252,18 +250,6 @@ void RandAddDynamicEnv(CSHA512& hasher)
|
|||||||
clock_gettime(CLOCK_BOOTTIME, &ts);
|
clock_gettime(CLOCK_BOOTTIME, &ts);
|
||||||
hasher << ts;
|
hasher << ts;
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
// On MacOS use mach_absolute_time (number of CPU ticks since boot) as a replacement for CLOCK_MONOTONIC,
|
|
||||||
// and clock_get_time for CALENDAR_CLOCK as a replacement for CLOCK_REALTIME.
|
|
||||||
hasher << mach_absolute_time();
|
|
||||||
// From https://gist.github.com/jbenet/1087739
|
|
||||||
clock_serv_t cclock;
|
|
||||||
mach_timespec_t mts = {};
|
|
||||||
if (host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock) == KERN_SUCCESS && clock_get_time(cclock, &mts) == KERN_SUCCESS) {
|
|
||||||
hasher << mts;
|
|
||||||
mach_port_deallocate(mach_task_self(), cclock);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
// gettimeofday is available on all UNIX systems, but only has microsecond precision.
|
// gettimeofday is available on all UNIX systems, but only has microsecond precision.
|
||||||
struct timeval tv = {};
|
struct timeval tv = {};
|
||||||
gettimeofday(&tv, nullptr);
|
gettimeofday(&tv, nullptr);
|
||||||
|
|||||||
Reference in new issue
Block a user