mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-30 22:05:46 +00:00
Code Issues Releases Wiki Activity

Add support for CLOCK_MONOTONIC_RAW and CLOCK_UPTIME_RAW, present

Browse Source 
on macOS.
This commit is contained in:
Todd C. Miller
2018-10-21 15:24:33 -06:00
parent 4c82e18ac1
commit 3710d5ba07
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/util/gettime.c
View File

@@ -44,13 +44,17 @@
*/ */
#if defined(CLOCK_BOOTTIME) #if defined(CLOCK_BOOTTIME)
# define SUDO_CLOCK_BOOTTIME CLOCK_BOOTTIME # define SUDO_CLOCK_BOOTTIME CLOCK_BOOTTIME
#elif defined(CLOCK_MONOTONIC_RAW)
# define SUDO_CLOCK_BOOTTIME CLOCK_MONOTONIC_RAW
#elif defined(CLOCK_MONOTONIC) #elif defined(CLOCK_MONOTONIC)
# define SUDO_CLOCK_BOOTTIME CLOCK_MONOTONIC # define SUDO_CLOCK_BOOTTIME CLOCK_MONOTONIC
#endif #endif
#if defined(CLOCK_UPTIME) #if defined(CLOCK_UPTIME_RAW)
# define SUDO_CLOCK_AWAKE CLOCK_UPTIME # define SUDO_CLOCK_UPTIME CLOCK_UPTIME_RAW
#elif defined(CLOCK_UPTIME)
# define SUDO_CLOCK_UPTIME CLOCK_UPTIME
#elif defined(CLOCK_MONOTONIC) #elif defined(CLOCK_MONOTONIC)
# define SUDO_CLOCK_AWAKE CLOCK_MONOTONIC # define SUDO_CLOCK_UPTIME CLOCK_MONOTONIC
#endif #endif
/* /*
@@ -159,7 +163,7 @@ sudo_gettime_mono_v1(struct timespec *ts)
* Monotonic time, only runs forward. * Monotonic time, only runs forward.
* We use a timer that only increments while awake, if possible. * We use a timer that only increments while awake, if possible.
*/ */
#if defined(HAVE_CLOCK_GETTIME) && defined(SUDO_CLOCK_AWAKE) #if defined(HAVE_CLOCK_GETTIME) && defined(SUDO_CLOCK_UPTIME)
int int
sudo_gettime_awake_v1(struct timespec *ts) sudo_gettime_awake_v1(struct timespec *ts)
{ {
@@ -173,10 +177,10 @@ sudo_gettime_awake_v1(struct timespec *ts)
# endif # endif
if (!has_monoclock) if (!has_monoclock)
debug_return_int(sudo_gettime_real(ts)); debug_return_int(sudo_gettime_real(ts));
if (clock_gettime(SUDO_CLOCK_AWAKE, ts) == -1) { if (clock_gettime(SUDO_CLOCK_UPTIME, ts) == -1) {
sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_ERRNO|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_ERRNO|SUDO_DEBUG_LINENO,
"clock_gettime(%d) failed, using wall clock", "clock_gettime(%d) failed, using wall clock",
(int)SUDO_CLOCK_AWAKE); (int)SUDO_CLOCK_UPTIME);
has_monoclock = 0; has_monoclock = 0;
debug_return_int(sudo_gettime_real(ts)); debug_return_int(sudo_gettime_real(ts));
} }