rename

Author: dunglas

Zend/Zend.m4

@@ -269,27 +269,27 @@ fi
 AC_MSG_CHECKING(whether to enable zend signal handling)
 AC_MSG_RESULT($ZEND_SIGNALS)
 
-dnl By default, enable Zend Timers only for ZTS builds
-AC_ARG_ENABLE([zend-timer],
-  [AS_HELP_STRING([--enable-zend-timer],
-    [whether to enable zend timer])],
-    [ZEND_TIMERS=$enableval],
-    [ZEND_TIMERS=$ZEND_ZTS])
+dnl By default, enable Zend Max Execution Timers only for ZTS builds
+AC_ARG_ENABLE([zend-max-execution-timers],
+  [AS_HELP_STRING([--enable-zend-max-execution-timers],
+    [whether to enable zend max execution timers])],
+    [ZEND_MAX_EXECUTION_TIMERS=$enableval],
+    [ZEND_MAX_EXECUTION_TIMERS=$ZEND_ZTS])
 
-AS_CASE(["$host_alias"], [*linux*], [], [ZEND_TIMERS='no'])
+AS_CASE(["$host_alias"], [*linux*], [], [ZEND_MAX_EXECUTION_TIMERS='no'])
 
 PHP_CHECK_FUNC(timer_create, rt)
 if test "$ac_cv_func_timer_create" != "yes"; then
-  ZEND_TIMERS='no'
+  ZEND_MAX_EXECUTION_TIMERS='no'
 fi
 
-if test "$ZEND_TIMERS" = "yes"; then
-  AC_DEFINE(ZEND_TIMERS, 1, [Use zend timer])
-  CFLAGS="$CFLAGS -DZEND_TIMERS"
+if test "$ZEND_MAX_EXECUTION_TIMERS" = "yes"; then
+  AC_DEFINE(ZEND_MAX_EXECUTION_TIMERS, 1, [Use zend max execution timers])
+  CFLAGS="$CFLAGS -DZEND_MAX_EXECUTION_TIMERS"
 fi
 
-AC_MSG_CHECKING(whether to enable zend timer)
-AC_MSG_RESULT($ZEND_TIMERS)
+AC_MSG_CHECKING(whether to enable zend max execution timers)
+AC_MSG_RESULT($ZEND_MAX_EXECUTION_TIMERS)
 
 ])
 

Zend/zend.c

@@ -35,7 +35,7 @@
 #include "zend_attributes.h"
 #include "zend_observer.h"
 #include "zend_fibers.h"
-#include "zend_timer.h"
+#include "zend_max_execution_timer.h"
 #include "Optimizer/zend_optimizer.h"
 
 static size_t global_map_ptr_last = 0;
@@ -822,7 +822,7 @@ static void zend_new_thread_end_handler(THREAD_T thread_id) /* {{{ */
 {
 	zend_copy_ini_directives();
 	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP);
-	zend_timer_init();
+	zend_max_execution_timer_init();
 }
 /* }}} */
 #endif

Zend/zend.h

@@ -39,7 +39,7 @@
 #include "zend_smart_str_public.h"
 #include "zend_smart_string_public.h"
 #include "zend_signal.h"
-#include "zend_timer.h"
+#include "zend_max_execution_timer.h"
 
 #define zend_sprintf sprintf
 

Zend/zend_execute_API.c

@@ -43,7 +43,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef ZEND_TIMERS
+#ifdef ZEND_MAX_EXECUTION_TIMERS
 #include <sys/syscall.h>
 #endif
 
@@ -195,7 +195,7 @@ void init_executor(void) /* {{{ */
 	EG(num_errors) = 0;
 	EG(errors) = NULL;
 
-	zend_timer_init();
+	zend_max_execution_timer_init();
 	zend_fiber_init();
 	zend_weakrefs_init();
 
@@ -407,7 +407,7 @@ void shutdown_executor(void) /* {{{ */
 	zend_shutdown_executor_values(fast_shutdown);
 
 	zend_weakrefs_shutdown();
-	zend_timer_shutdown();
+	zend_max_execution_timer_shutdown();
 	zend_fiber_shutdown();
 
 	zend_try {
@@ -1319,11 +1319,11 @@ ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void) /* {{{ */
 /* }}} */
 
 #ifndef ZEND_WIN32
-# ifdef ZEND_TIMERS
+# ifdef ZEND_MAX_EXECUTION_TIMERS
 static void zend_timeout_handler(int dummy, siginfo_t *si, void *uc) /* {{{ */
 {
-	if (si->si_value.sival_ptr != &EG(timer)) {
-#ifdef TIMER_DEBUG
+	if (si->si_value.sival_ptr != &EG(max_execution_timer_timer)) {
+#ifdef MAX_EXECUTION_TIMERS_DEBUG
 		fprintf(stderr, "Executing previous handler (if set) for unexpected signal SIGRTMIN received on thread %d\n", (pid_t) syscall(SYS_gettid));
 #endif
 
@@ -1439,8 +1439,8 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */
 		zend_error_noreturn(E_ERROR, "Could not queue new timer");
 		return;
 	}
-#elif defined(ZEND_TIMERS)
-	zend_timer_settime(seconds);
+#elif defined(ZEND_MAX_EXECUTION_TIMERS)
+	zend_max_execution_timer_settime(seconds);
 
 	if (reset_signals) {
 		sigset_t sigset;
@@ -1519,8 +1519,8 @@ void zend_unset_timeout(void) /* {{{ */
 		}
 		tq_timer = NULL;
 	}
-#elif ZEND_TIMERS
-	zend_timer_settime(0);
+#elif ZEND_MAX_EXECUTION_TIMERS
+	zend_max_execution_timer_settime(0);
 #elif defined(HAVE_SETITIMER)
 	if (EG(timeout_seconds)) {
 		struct itimerval no_timeout;

Zend/zend_globals.h

@@ -37,7 +37,7 @@
 #include "zend_multibyte.h"
 #include "zend_multiply.h"
 #include "zend_arena.h"
-#include "zend_timer.h"
+#include "zend_max_execution_timer.h"
 
 /* Define ZTS if you want a thread-safe Zend */
 /*#undef ZTS*/
@@ -268,8 +268,8 @@ struct _zend_executor_globals {
 	uint32_t num_errors;
 	zend_error_info **errors;
 
-#ifdef ZEND_TIMERS
-	timer_t timer;
+#ifdef ZEND_MAX_EXECUTION_TIMERS
+	timer_t max_execution_timer_timer;
 	pid_t pid;
 	struct sigaction oldact;
 #endif

Zend/zend_timer.c Zend/zend_max_execution_timer.cZend/zend_timer.c renamed to Zend/zend_max_execution_timer.c

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef ZEND_TIMERS
+#ifdef ZEND_MAX_EXECUTION_TIMERS
 
 #include <stdio.h>
 #include <signal.h>
@@ -33,31 +33,31 @@
 # define sigev_notify_thread_id _sigev_un._tid
 # endif
 
-ZEND_API void zend_timer_init(void) /* {{{ */
+ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 {
 	struct sigevent sev;
 	sev.sigev_notify = SIGEV_THREAD_ID;
-	sev.sigev_value.sival_ptr = &EG(timer);
+	sev.sigev_value.sival_ptr = &EG(max_execution_timer_timer);
 	sev.sigev_signo = SIGRTMIN;
 	sev.sigev_notify_thread_id = (pid_t) syscall(SYS_gettid);
 
 	EG(pid) = getpid();
 	// 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
-	if (timer_create(CLOCK_BOOTTIME, &sev, &EG(timer)) != 0) {
+	if (timer_create(CLOCK_BOOTTIME, &sev, &EG(max_execution_timer_timer)) != 0) {
 		zend_strerror_noreturn(E_ERROR, errno, "Could not create timer");
 	}
 
-#  ifdef TIMER_DEBUG
-		fprintf(stderr, "Timer %#jx created on thread %d\n", (uintmax_t) EG(timer), sev.sigev_notify_thread_id);
+#  ifdef MAX_EXECUTION_TIMERS_DEBUG
+		fprintf(stderr, "Timer %#jx created on thread %d\n", (uintmax_t) EG(max_execution_timer_timer), sev.sigev_notify_thread_id);
 #  endif
 
 	sigaction(sev.sigev_signo, NULL, &EG(oldact));
 }
 /* }}} */
 
-void zend_timer_settime(zend_long seconds) /* {{{ }*/
+void zend_max_execution_timer_settime(zend_long seconds) /* {{{ }*/
 {
-	timer_t timer = EG(timer);
+	timer_t timer = EG(max_execution_timer_timer);
 
 	/* Timer doesn't anymore on request shutdown. */
 	if (timer == (timer_t){0}) {
@@ -68,7 +68,7 @@ void zend_timer_settime(zend_long seconds) /* {{{ }*/
 	its.it_value.tv_sec = seconds;
 	its.it_value.tv_nsec = its.it_interval.tv_sec = its.it_interval.tv_nsec = 0;
 
-# ifdef TIMER_DEBUG
+# ifdef MAX_EXECUTION_TIMERS_DEBUG
 	fprintf(stderr, "Setting timer %#jx on thread %d (%ld seconds)...\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid), seconds);
 # endif
 
@@ -78,29 +78,29 @@ void zend_timer_settime(zend_long seconds) /* {{{ }*/
 }
 /* }}} */
 
-void zend_timer_shutdown(void) /* {{{ */
+void zend_max_execution_timer_shutdown(void) /* {{{ */
 {
 	/* Don't try to delete a timer created before a call to fork() */
 	if (EG(pid) != getpid()) {
 		return;
 	}
 
-	timer_t timer = EG(timer);
+	timer_t timer = EG(max_execution_timer_timer);
 	if (timer == (timer_t){0}) {
 		/* Don't trigger an error here because the timer may not be initialized when PHP fail early, and on threads created by PHP but not managed by it. */
-# ifdef TIMER_DEBUG
+# ifdef MAX_EXECUTION_TIMERS_DEBUG
 		fprintf(stderr, "Could not delete timer that has not been created on thread %d\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid));
 # endif
 
 		return;
 	}
 
-# ifdef TIMER_DEBUG
+# ifdef MAX_EXECUTION_TIMERS_DEBUG
 	fprintf(stderr, "Deleting timer %#jx on thread %d...\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid));
 # endif
 
 	int err = timer_delete(timer);
-	EG(timer) = (timer_t){0};
+	EG(max_execution_timer_timer) = (timer_t){0};
 	if (err != 0) {
 		zend_strerror_noreturn(E_ERROR, errno, "Could not delete timer");
 	}

Zend/zend_timer.h Zend/zend_max_execution_timer.hZend/zend_timer.h renamed to Zend/zend_max_execution_timer.h

@@ -14,23 +14,23 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef ZEND_TIMER_H
-#define ZEND_TIMER_H
+#ifndef ZEND_MAX_EXECUTION_TIMER_H
+#define ZEND_MAX_EXECUTION_TIMER_H
 
-# ifdef ZEND_TIMERS
+# ifdef ZEND_MAX_EXECUTION_TIMERS
 
 #include "zend_long.h"
 
 /* Must be called after calls to fork() */
-ZEND_API void zend_timer_init(void);
-void zend_timer_settime(zend_long seconds);
-void zend_timer_shutdown(void);
+ZEND_API void zend_max_execution_timer_init(void);
+void zend_max_execution_timer_settime(zend_long seconds);
+void zend_max_execution_timer_shutdown(void);
 
 # else
 
-#define zend_timer_init()
-#define zend_timer_settime(seconds)
-#define zend_timer_shutdown()
+#define zend_max_execution_timer_init()
+#define zend_max_execution_timer_settime(seconds)
+#define zend_max_execution_timer_shutdown()
 
 # endif
 #endif

configure.ac

@@ -1634,7 +1634,7 @@ PHP_ADD_SOURCES(Zend, \
     zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \
     zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \
     zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c \
-    zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_timer.c \
+    zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_max_execution_timer.c \
 	Optimizer/zend_optimizer.c \
 	Optimizer/pass1.c \
 	Optimizer/pass3.c \

ext/pcntl/pcntl.c

@@ -50,7 +50,7 @@
 # define NSIG 32
 #endif
 
-#include "Zend/zend_timer.h"
+#include "Zend/zend_max_execution_timer.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(pcntl)
 static PHP_GINIT_FUNCTION(pcntl);
@@ -534,7 +534,7 @@ PHP_FUNCTION(pcntl_fork)
 		PCNTL_G(last_error) = errno;
 		php_error_docref(NULL, E_WARNING, "Error %d", errno);
 	} else if (id == 0) {
-		zend_timer_init();
+		zend_max_execution_timer_init();
 	}
 
 	RETURN_LONG((zend_long) id);

ext/standard/info.c

@@ -891,10 +891,10 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
 			efree(descr);
 		}
 
-#ifdef ZEND_TIMERS
-		php_info_print_table_row(2, "Zend Timers", "enabled" );
+#ifdef ZEND_MAX_EXECUTION_TIMERS
+		php_info_print_table_row(2, "Zend Max Execution Timers", "enabled" );
 #else
-		php_info_print_table_row(2, "Zend Timers", "disabled" );
+		php_info_print_table_row(2, "Zend Max Execution Timers", "disabled" );
 #endif
 
 #if HAVE_IPV6