diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2016-03-09 02:46:50 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-03-09 02:46:50 +0100 |
| commit | 2c48bd344d2c4b5e08dae9aea5ff44fc19a5e363 (patch) | |
| tree | 1a23b165057ad8074473697250a36ffcff345019 /misc.c | |
| parent | make a regress-binaries target (diff) | |
| download | openssh-2c48bd344d2c4b5e08dae9aea5ff44fc19a5e363.tar.xz openssh-2c48bd344d2c4b5e08dae9aea5ff44fc19a5e363.zip | |
Add compat to monotime_double().
Apply all of the portability changes in monotime() to monotime() double.
Fixes build on at least older FreeBSD systems.
Diffstat (limited to '')
| -rw-r--r-- | misc.c | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -912,12 +912,26 @@ monotime(void) double monotime_double(void) { +#if defined(HAVE_CLOCK_GETTIME) && \ + (defined(CLOCK_MONOTONIC) || defined(CLOCK_BOOTTIME)) struct timespec ts; + static int gettime_failed = 0; - if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) - fatal("clock_gettime: %s", strerror(errno)); + if (!gettime_failed) { +#if defined(CLOCK_BOOTTIME) + if (clock_gettime(CLOCK_BOOTTIME, &ts) == 0) + return (ts.tv_sec + (double)ts.tv_nsec / 1000000000); +#endif +#if defined(CLOCK_MONOTONIC) + if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) + return (ts.tv_sec + (double)ts.tv_nsec / 1000000000); +#endif + debug3("clock_gettime: %s", strerror(errno)); + gettime_failed = 1; + } +#endif /* HAVE_CLOCK_GETTIME && (CLOCK_MONOTONIC || CLOCK_BOOTTIME */ - return (ts.tv_sec + (double)ts.tv_nsec / 1000000000); + return (double)time(NULL); } void |