zend_hrtime: Use clock_gettime_nsec_np() for macOS if available

NEWS

@@ -12,6 +12,8 @@ PHP                                                                        NEWS
   . Added PHP_BUILD_DATE constant. (cmb)
   . Added support for Closures in constant expressions. (timwolla,
     Volker Dusch)
+  . Use `clock_gettime_nsec_np()` for high resolution timer on macOS
+    if available. (timwolla)
 
 - Curl:
   . Added curl_multi_get_handles(). (timwolla)

UPGRADING

@@ -180,6 +180,11 @@ PHP 8.5 UPGRADE NOTES
 13. Other Changes
 ========================================
 
+- Core:
+  The high resolution timer (`hrtime()`) on macOS now uses the recommended
+  `clock_gettime_nsec_np(CLOCK_UPTIME_RAW)` API instead of
+  `mach_absolute_time()`.
+
 ========================================
 14. Performance Improvements
 ========================================

Zend/Zend.m4

@@ -151,6 +151,11 @@ AC_CHECK_FUNCS(m4_normalize([
   pthread_stackseg_np
 ]))
 
+AC_CHECK_DECL([clock_gettime_nsec_np],
+  [AC_DEFINE([HAVE_CLOCK_GETTIME_NSEC_NP], [1],
+    [Define to 1 if you have the declaration of 'clock_gettime_nsec_np'.])],,
+  [#include <time.h>])
+
 dnl
 dnl Check for sigsetjmp. If sigsetjmp is defined as a macro, use AC_CHECK_DECL
 dnl as a fallback since AC_CHECK_FUNC cannot detect macros.

Zend/zend_hrtime.c

@@ -33,7 +33,7 @@
 
 ZEND_API double zend_hrtime_timer_scale = .0;
 
-#elif ZEND_HRTIME_PLATFORM_APPLE
+#elif ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE
 
 # include <mach/mach_time.h>
 # include <string.h>
@@ -62,7 +62,7 @@ void zend_startup_hrtime(void)
 		zend_hrtime_timer_scale = (double)ZEND_NANO_IN_SEC / (zend_hrtime_t)tf.QuadPart;
 	}
 
-#elif ZEND_HRTIME_PLATFORM_APPLE
+#elif ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE
 
 	mach_timebase_info(&zend_hrtime_timerlib_info);
 

Zend/zend_hrtime.h

@@ -33,7 +33,8 @@
 
 #define ZEND_HRTIME_PLATFORM_POSIX   0
 #define ZEND_HRTIME_PLATFORM_WINDOWS 0
-#define ZEND_HRTIME_PLATFORM_APPLE   0
+#define ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE 0
+#define ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC 0
 #define ZEND_HRTIME_PLATFORM_HPUX    0
 #define ZEND_HRTIME_PLATFORM_AIX     0
 
@@ -43,9 +44,12 @@
 #elif defined(_WIN32) || defined(_WIN64)
 # undef  ZEND_HRTIME_PLATFORM_WINDOWS
 # define ZEND_HRTIME_PLATFORM_WINDOWS 1
+#elif HAVE_CLOCK_GETTIME_NSEC_NP
+# undef  ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC
+# define ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC 1
 #elif defined(__APPLE__)
-# undef  ZEND_HRTIME_PLATFORM_APPLE
-# define ZEND_HRTIME_PLATFORM_APPLE 1
+# undef  ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE
+# define ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE 1
 #elif (defined(__hpux) || defined(hpux)) || ((defined(__sun__) || defined(__sun) || defined(sun)) && (defined(__SVR4) || defined(__svr4__)))
 # undef  ZEND_HRTIME_PLATFORM_HPUX
 # define ZEND_HRTIME_PLATFORM_HPUX 1
@@ -54,7 +58,7 @@
 # define ZEND_HRTIME_PLATFORM_AIX 1
 #endif
 
-#define ZEND_HRTIME_AVAILABLE (ZEND_HRTIME_PLATFORM_POSIX || ZEND_HRTIME_PLATFORM_WINDOWS || ZEND_HRTIME_PLATFORM_APPLE || ZEND_HRTIME_PLATFORM_HPUX || ZEND_HRTIME_PLATFORM_AIX)
+#define ZEND_HRTIME_AVAILABLE (ZEND_HRTIME_PLATFORM_POSIX || ZEND_HRTIME_PLATFORM_WINDOWS || ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE || ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC || ZEND_HRTIME_PLATFORM_HPUX || ZEND_HRTIME_PLATFORM_AIX)
 
 BEGIN_EXTERN_C()
 
@@ -82,7 +86,9 @@ static zend_always_inline zend_hrtime_t zend_hrtime(void)
 	LARGE_INTEGER lt = {0};
 	QueryPerformanceCounter(&lt);
 	return (zend_hrtime_t)((zend_hrtime_t)lt.QuadPart * zend_hrtime_timer_scale);
-#elif ZEND_HRTIME_PLATFORM_APPLE
+#elif ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC
+	return clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
+#elif ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE
 	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 };