archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

zend_hrtime: Use clock_gettime_nsec_np() for macOS if available (#17089)

Browse source 
As per the Apple developer documentation:

> Prefer to use the equivalent clock_gettime_nsec_np(CLOCK_UPTIME_RAW) in
> nanoseconds.

and also

> This API has the potential of being misused to access device signals to try
> to identify the device or user, also known as fingerprinting. Regardless of
> whether a user gives your app permission to track, fingerprinting is not
> allowed. When you use this API in your app or third-party SDK (an SDK not
> provided by Apple), declare your usage and the reason for using the API in
> your app or third-party SDK’s PrivacyInfo.xcprivacy file.

see https://developer.apple.com/documentation/kernel/1462446-mach_absolute_time
This commit is contained in:
Tim Düsterhus 2024-12-10 12:19:41 +01:00 • committed by GitHub
parent 2541b9f0de
commit 85f69a7a3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

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

5
UPGRADING
View file

@ -193,6 +193,11 @@ PHP 8.5 UPGRADE NOTES
13. Other Changes 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 14. Performance Improvements
======================================== ========================================

5
Zend/Zend.m4
View file

@ -151,6 +151,11 @@ AC_CHECK_FUNCS(m4_normalize([
pthread_stackseg_np 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
dnl Check for sigsetjmp. If sigsetjmp is defined as a macro, use AC_CHECK_DECL 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. dnl as a fallback since AC_CHECK_FUNC cannot detect macros.

4
Zend/zend_hrtime.c
View file

@ -33,7 +33,7 @@
ZEND_API double zend_hrtime_timer_scale = .0; 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 <mach/mach_time.h>
# include <string.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; 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); mach_timebase_info(&zend_hrtime_timerlib_info);

16
Zend/zend_hrtime.h
View file

@ -33,7 +33,8 @@
#define ZEND_HRTIME_PLATFORM_POSIX 0 #define ZEND_HRTIME_PLATFORM_POSIX 0
#define ZEND_HRTIME_PLATFORM_WINDOWS 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_HPUX 0
#define ZEND_HRTIME_PLATFORM_AIX 0 #define ZEND_HRTIME_PLATFORM_AIX 0
@ -43,9 +44,12 @@
#elif defined(_WIN32) || defined(_WIN64) #elif defined(_WIN32) || defined(_WIN64)
# undef ZEND_HRTIME_PLATFORM_WINDOWS # undef ZEND_HRTIME_PLATFORM_WINDOWS
# define ZEND_HRTIME_PLATFORM_WINDOWS 1 # 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__) #elif defined(__APPLE__)
# undef ZEND_HRTIME_PLATFORM_APPLE # undef ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE
# define ZEND_HRTIME_PLATFORM_APPLE 1 # define ZEND_HRTIME_PLATFORM_APPLE_MACH_ABSOLUTE 1
#elif (defined(__hpux) || defined(hpux)) || ((defined(__sun__) || defined(__sun) || defined(sun)) && (defined(__SVR4) || defined(__svr4__))) #elif (defined(__hpux) || defined(hpux)) || ((defined(__sun__) || defined(__sun) || defined(sun)) && (defined(__SVR4) || defined(__svr4__)))
# undef ZEND_HRTIME_PLATFORM_HPUX # undef ZEND_HRTIME_PLATFORM_HPUX
# define ZEND_HRTIME_PLATFORM_HPUX 1 # define ZEND_HRTIME_PLATFORM_HPUX 1
@ -54,7 +58,7 @@
# define ZEND_HRTIME_PLATFORM_AIX 1 # define ZEND_HRTIME_PLATFORM_AIX 1
#endif #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() BEGIN_EXTERN_C()
@ -82,7 +86,9 @@ static zend_always_inline zend_hrtime_t zend_hrtime(void)
LARGE_INTEGER lt = {0}; LARGE_INTEGER lt = {0};
QueryPerformanceCounter(&lt); QueryPerformanceCounter(&lt);
return (zend_hrtime_t)((zend_hrtime_t)lt.QuadPart * zend_hrtime_timer_scale); 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; return (zend_hrtime_t)mach_absolute_time() * zend_hrtime_timerlib_info.numer / zend_hrtime_timerlib_info.denom;
#elif ZEND_HRTIME_PLATFORM_POSIX #elif ZEND_HRTIME_PLATFORM_POSIX
struct timespec ts = { .tv_sec = 0, .tv_nsec = 0 }; struct timespec ts = { .tv_sec = 0, .tv_nsec = 0 };