Skip to content

zend_hrtime: use CLOCK_MONOTONIC instead of CLOCK_MONOTONIC_RAW #23790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimWolla merged 4 commits into from
Sep 30, 2026
Merged

zend_hrtime: use CLOCK_MONOTONIC instead of CLOCK_MONOTONIC_RAW #23790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9b64d5
zend_hrtime: use CLOCK_MONOTONIC instead of CLOCK_MONOTONIC_RAW
nicolas-grekas Sep 20, 2026
0066031
zend_hrtime: Fix error message for broken CLOCK_MONOTONIC
TimWolla Sep 30, 2026
1e4b26b
Merge branch 'PHP-8.6' into hrtime-clock-monotonic
TimWolla Sep 30, 2026
5e4c11b
NEWS
TimWolla Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ PHP NEWS
constant, and as an alias in class_alias() and use declarations. (Girgias)
. Deprecated using "_" as a constant name and as an alias for a class or
constant in use declarations. (Girgias)
. Switch the POSIX high resolution timer back to CLOCK_MONOTONIC from
CLOCK_MONOTONIC_RAW. (nicolas-grekas)

- FFI:
. Fixed crashes with FFI callbacks created from __call() trampolines
Expand Down
11 changes: 2 additions & 9 deletions Zend/zend_hrtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,12 @@ void zend_startup_hrtime(void)

struct timespec ts;

#ifdef CLOCK_MONOTONIC_RAW
if (EXPECTED(0 == clock_gettime(CLOCK_MONOTONIC_RAW, &ts))) {
zend_hrtime_posix_clock_id = CLOCK_MONOTONIC_RAW;
return;
}
#endif

if (EXPECTED(0 == clock_gettime(zend_hrtime_posix_clock_id, &ts))) {
if (EXPECTED(0 == clock_gettime(CLOCK_MONOTONIC, &ts))) {
return;
}

// zend_error mechanism is not initialized at that point
fprintf(stderr, "No working CLOCK_MONOTONIC* found, this should never happen\n");
fprintf(stderr, "No working CLOCK_MONOTONIC found, this should never happen\n");
abort();

#endif
Expand Down
3 changes: 2 additions & 1 deletion Zend/zend_hrtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ ZEND_API extern mach_timebase_info_data_t zend_hrtime_timerlib_info;

#elif ZEND_HRTIME_PLATFORM_POSIX

/* Not read anymore, kept for ABI compatibility */
ZEND_API extern clockid_t zend_hrtime_posix_clock_id;

#endif
Expand All @@ -94,7 +95,7 @@ static zend_always_inline zend_hrtime_t zend_hrtime(void)
return (zend_hrtime_t)mach_absolute_time() * zend_hrtime_timerlib_info.numer / zend_hrtime_timerlib_info.denom;
#elif ZEND_HRTIME_PLATFORM_POSIX
struct timespec ts = { .tv_sec = 0, .tv_nsec = 0 };
clock_gettime(zend_hrtime_posix_clock_id, &ts);
clock_gettime(CLOCK_MONOTONIC, &ts);
return ((zend_hrtime_t) ts.tv_sec * (zend_hrtime_t)ZEND_NANO_IN_SEC) + ts.tv_nsec;
#elif ZEND_HRTIME_PLATFORM_HPUX
return (zend_hrtime_t) gethrtime();
Expand Down
Loading