diff options
| author | fanquake <fanquake@gmail.com> | 2019-12-23 15:44:39 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-02-06 08:24:13 +0800 |
| commit | dc9305b6162ec615ff5fb2876e4f312051b543af (patch) | |
| tree | caddbf9089e86721ab6c7373e257b18258f67356 /src/randomenv.cpp | |
| parent | 8a56f79d491271120abc3843c46e9dda44edd308 (diff) | |
| download | bitcoin-dc9305b6162ec615ff5fb2876e4f312051b543af.tar.xz | |
random: don't special case clock usage on macOS
clock_gettime(), CLOCK_MONOTONIC and CLOCK_REALTIME are all available for use on
macOS (now that we require macOS >=10.12). Use them rather than the deprecated
mach_timespec_t time API.
master:
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 commit:
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
Diffstat (limited to 'src/randomenv.cpp')
| -rw-r--r-- | src/randomenv.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/randomenv.cpp b/src/randomenv.cpp index 6992c720ff..27f5b1b082 100644 --- a/src/randomenv.cpp +++ b/src/randomenv.cpp @@ -237,8 +237,6 @@ void RandAddDynamicEnv(CSHA512& hasher) GetSystemTimeAsFileTime(&ftime); hasher << ftime; #else -# ifndef __MACH__ - // On non-MacOS systems, use various clock_gettime() calls. struct timespec ts = {}; # ifdef CLOCK_MONOTONIC clock_gettime(CLOCK_MONOTONIC, &ts); @@ -252,18 +250,6 @@ void RandAddDynamicEnv(CSHA512& hasher) clock_gettime(CLOCK_BOOTTIME, &ts); hasher << ts; # 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. struct timeval tv = {}; gettimeofday(&tv, nullptr); |