mirror of
https://github.com/php/php-src.git
synced 2024-09-21 09:57:23 +00:00
Revert "Merge branch 'PHP-8.3'"
This reverts commitb363a606a4
, reversing changes made to3ed5eee5d3
.
This commit is contained in:
parent
96840072fc
commit
b75775ea39
@ -27,13 +27,14 @@
|
||||
# include <pthread_np.h>
|
||||
# endif
|
||||
|
||||
#include "zend.h"
|
||||
#include "zend_globals.h"
|
||||
#include "zend_portability.h"
|
||||
|
||||
#if __has_feature(memory_sanitizer)
|
||||
# include <sanitizer/msan_interface.h>
|
||||
#endif
|
||||
|
||||
#include "zend.h"
|
||||
#include "zend_globals.h"
|
||||
|
||||
// Musl Libc defines this macro, glibc does not
|
||||
// According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
|
||||
# ifndef sigev_notify_thread_id
|
||||
@ -67,8 +68,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
|
||||
|
||||
#if __has_feature(memory_sanitizer)
|
||||
/* MSan does not intercept timer_create() */
|
||||
__msan_unpoison(&EG(max_execution_timer_timer),
|
||||
sizeof(EG(max_execution_timer_timer)));
|
||||
__msan_unpoison(&EG(max_execution_timer_timer),
|
||||
sizeof(EG(max_execution_timer_timer)));
|
||||
#endif
|
||||
|
||||
// Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727
|
||||
|
Loading…
Reference in New Issue
Block a user