rename to zend_timers

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 Timer only for ZTS builds
+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_TIMER=$enableval],
-    [ZEND_TIMER=$ZEND_ZTS])
+    [ZEND_TIMERS=$enableval],
+    [ZEND_TIMERS=$ZEND_ZTS])
 
-AS_CASE(["$host_alias"], [*linux*], [], [ZEND_TIMER='no'])
+AS_CASE(["$host_alias"], [*linux*], [], [ZEND_TIMERS='no'])
 
 PHP_CHECK_FUNC(timer_create, rt)
 if test "$ac_cv_func_timer_create" != "yes"; then
-  ZEND_TIMER='no'
+  ZEND_TIMERS='no'
 fi
 
-if test "$ZEND_TIMER" = "yes"; then
-  AC_DEFINE(ZEND_TIMER, 1, [Use zend timer])
-  CFLAGS="$CFLAGS -DZEND_TIMER"
+if test "$ZEND_TIMERS" = "yes"; then
+  AC_DEFINE(ZEND_TIMERS, 1, [Use zend timer])
+  CFLAGS="$CFLAGS -DZEND_TIMERS"
 fi
 
 AC_MSG_CHECKING(whether to enable zend timer)
-AC_MSG_RESULT($ZEND_TIMER)
+AC_MSG_RESULT($ZEND_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_timers.h"
 #include "Optimizer/zend_optimizer.h"
 
 static size_t global_map_ptr_last = 0;
@@ -822,16 +822,16 @@ static void zend_new_thread_end_handler(THREAD_T thread_id) /* {{{ */
 {
 	zend_copy_ini_directives();
 	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP);
-#ifdef ZEND_TIMER
-	zend_timer_create();
+#ifdef ZEND_TIMERS
+	zend_timers_create();
 #endif
 }
 /* }}} */
 
 static void zend_thread_shutdown_handler(void) { /* {{{ */
 	zend_interned_strings_dtor();
-#ifdef ZEND_TIMER
-	zend_timer_delete();
+#ifdef ZEND_TIMERS
+	zend_timers_delete();
 #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_timers.h"
 
 #define zend_sprintf sprintf
 

Zend/zend_execute_API.c

@@ -43,7 +43,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef ZEND_TIMER
+#ifdef ZEND_TIMERS
 #include <sys/syscall.h>
 #endif
 
@@ -173,8 +173,8 @@ void init_executor(void) /* {{{ */
 	EG(full_tables_cleanup) = 0;
 	EG(vm_interrupt) = 0;
 	EG(timed_out) = 0;
-#ifdef ZEND_TIMER
-	zend_timer_create();
+#ifdef ZEND_TIMERS
+	zend_timers_create();
 #endif
 
 	EG(exception) = NULL;
@@ -1320,7 +1320,7 @@ ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void) /* {{{ */
 /* }}} */
 
 #ifndef ZEND_WIN32
-# ifdef ZEND_TIMER
+# ifdef ZEND_TIMERS
 static void zend_timeout_handler(int dummy, siginfo_t *si, void *uc) /* {{{ */
 {
 	if (si->si_value.sival_ptr != &EG(timer)) {
@@ -1440,8 +1440,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_TIMER)
-	zend_timer_settime(seconds);
+#elif defined(ZEND_TIMERS)
+	zend_timers_settime(seconds);
 
 	if (reset_signals) {
 		sigset_t sigset;
@@ -1520,8 +1520,8 @@ void zend_unset_timeout(void) /* {{{ */
 		}
 		tq_timer = NULL;
 	}
-#elif ZEND_TIMER
-	zend_timer_settime(0);
+#elif ZEND_TIMERS
+	zend_timers_settime(0);
 #elif defined(HAVE_SETITIMER)
 	if (EG(timeout_seconds)) {
 		struct itimerval no_timeout;

Zend/zend_globals.h

@@ -36,7 +36,7 @@
 #include "zend_multibyte.h"
 #include "zend_multiply.h"
 #include "zend_arena.h"
-#include "zend_timer.h"
+#include "zend_timers.h"
 
 /* Define ZTS if you want a thread-safe Zend */
 /*#undef ZTS*/
@@ -267,7 +267,7 @@ struct _zend_executor_globals {
 	uint32_t num_errors;
 	zend_error_info **errors;
 
-#ifdef ZEND_TIMER
+#ifdef ZEND_TIMERS
 	timer_t timer;
 	struct sigaction oldact;
 #endif

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

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef ZEND_TIMER
+#ifdef ZEND_TIMERS
 
 #include <stdio.h>
 #include <signal.h>
@@ -33,7 +33,7 @@
 # define sigev_notify_thread_id _sigev_un._tid
 # endif
 
-ZEND_API void zend_timer_create(void) /* {{{ */
+ZEND_API void zend_timers_create(void) /* {{{ */
 {
 	struct sigevent sev;
 	sev.sigev_notify = SIGEV_THREAD_ID;
@@ -59,7 +59,7 @@ ZEND_API void zend_timer_create(void) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void zend_timer_settime(zend_long seconds) /* {{{ }*/
+ZEND_API void zend_timers_settime(zend_long seconds) /* {{{ }*/
 {
 	timer_t timer = EG(timer);
 
@@ -77,7 +77,7 @@ ZEND_API void zend_timer_settime(zend_long seconds) /* {{{ }*/
 }
 /* }}} */
 
-ZEND_API void zend_timer_delete(void) /* {{{ */
+ZEND_API void zend_timers_delete(void) /* {{{ */
 {
 	timer_t timer = EG(timer);
 	if (timer == (timer_t){0}) {

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

@@ -14,16 +14,16 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef ZEND_TIMER_H
-#define ZEND_TIMER_H
+#ifndef ZEND_TIMERS_H
+#define ZEND_TIMERS_H
 
-# ifdef ZEND_TIMER
+# ifdef ZEND_TIMERS
 
 #include "zend_long.h"
 
-ZEND_API void zend_timer_create(void);
-ZEND_API void zend_timer_settime(zend_long seconds);
-ZEND_API void zend_timer_delete(void);
+ZEND_API void zend_timers_create(void);
+ZEND_API void zend_timers_settime(zend_long seconds);
+ZEND_API void zend_timers_delete(void);
 
 # 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_timers.c \
 	Optimizer/zend_optimizer.c \
 	Optimizer/pass1.c \
 	Optimizer/pass3.c \

ext/opcache/ZendAccelerator.c

@@ -4693,8 +4693,8 @@ static int accel_finish_startup(void)
 					zend_accel_error(ACCEL_LOG_WARNING, "Preloading failed to setuid(%d)", pw->pw_uid);
 					exit(1);
 				}
-#ifdef ZEND_TIMER
-				zend_timer_create();
+#ifdef ZEND_TIMERS
+				zend_timers_create();
 #endif
 				in_child = 1;
 			} else { /* parent */

ext/pcntl/pcntl.c

@@ -50,7 +50,7 @@
 # define NSIG 32
 #endif
 
-#include "Zend/zend_timer.h"
+#include "Zend/zend_timers.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(pcntl)
 static PHP_GINIT_FUNCTION(pcntl);
@@ -534,8 +534,8 @@ PHP_FUNCTION(pcntl_fork)
 		PCNTL_G(last_error) = errno;
 		php_error_docref(NULL, E_WARNING, "Error %d", errno);
 	} else if (id == 0) {
-		#ifdef ZEND_TIMER
-			zend_timer_create();
+		#ifdef ZEND_TIMERS
+			zend_timers_create();
 		#endif
 	}