cleanup API

Author: dunglas

Zend/zend.c

@@ -35,7 +35,7 @@
 #include "zend_attributes.h"
 #include "zend_observer.h"
 #include "zend_fibers.h"
-#include "zend_timers.h"
+#include "zend_timer.h"
 #include "Optimizer/zend_optimizer.h"
 
 static size_t global_map_ptr_last = 0;
@@ -822,16 +822,14 @@ 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_TIMERS
-	zend_timers_startup();
-#endif
+	zend_timer_init();
 }
 /* }}} */
 
 static void zend_thread_shutdown_handler(void) { /* {{{ */
 	zend_interned_strings_dtor();
 #ifdef ZEND_TIMERS
-	zend_timers_shutdown();
+	zend_timer_shutdown();
 #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_timers.h"
+#include "zend_timer.h"
 
 #define zend_sprintf sprintf
 

Zend/zend_execute_API.c

@@ -173,9 +173,6 @@ void init_executor(void) /* {{{ */
 	EG(full_tables_cleanup) = 0;
 	EG(vm_interrupt) = 0;
 	EG(timed_out) = 0;
-#ifdef ZEND_TIMERS
-	zend_timers_startup();
-#endif
 
 	EG(exception) = NULL;
 	EG(prev_exception) = NULL;
@@ -198,6 +195,7 @@ void init_executor(void) /* {{{ */
 	EG(num_errors) = 0;
 	EG(errors) = NULL;
 
+	zend_timer_init();
 	zend_fiber_init();
 	zend_weakrefs_init();
 
@@ -1441,7 +1439,7 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */
 		return;
 	}
 #elif defined(ZEND_TIMERS)
-	zend_timers_settime(seconds);
+	zend_timer_settime(seconds);
 
 	if (reset_signals) {
 		sigset_t sigset;
@@ -1521,7 +1519,7 @@ void zend_unset_timeout(void) /* {{{ */
 		tq_timer = NULL;
 	}
 #elif ZEND_TIMERS
-	zend_timers_settime(0);
+	zend_timer_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_timers.h"
+#include "zend_timer.h"
 
 /* Define ZTS if you want a thread-safe Zend */
 /*#undef ZTS*/

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

@@ -33,7 +33,7 @@
 # define sigev_notify_thread_id _sigev_un._tid
 # endif
 
-ZEND_API void zend_timers_startup(void) /* {{{ */
+ZEND_API void zend_timer_init(void) /* {{{ */
 {
 	struct sigevent sev;
 	sev.sigev_notify = SIGEV_THREAD_ID;
@@ -60,7 +60,7 @@ ZEND_API void zend_timers_startup(void) /* {{{ */
 }
 /* }}} */
 
-void zend_timers_settime(zend_long seconds) /* {{{ }*/
+void zend_timer_settime(zend_long seconds) /* {{{ }*/
 {
 	timer_t timer = EG(timer);
 
@@ -78,7 +78,7 @@ void zend_timers_settime(zend_long seconds) /* {{{ }*/
 }
 /* }}} */
 
-void zend_timers_shutdown(void) /* {{{ */
+void zend_timer_shutdown(void) /* {{{ */
 {
 	timer_t timer = EG(timer);
 	if (timer == (timer_t){0}) {

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

@@ -14,16 +14,23 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef ZEND_TIMERS_H
-#define ZEND_TIMERS_H
+#ifndef ZEND_TIMER_H
+#define ZEND_TIMER_H
 
 # ifdef ZEND_TIMERS
 
 #include "zend_long.h"
 
-ZEND_API void zend_timers_startup(void);
-void zend_timers_settime(zend_long seconds);
-void zend_timers_shutdown(void);
+/* 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);
+
+# else
+
+#define zend_timer_init()
+#define zend_timer_settime(seconds)
+#define zend_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_timers.c \
+    zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_timer.c \
 	Optimizer/zend_optimizer.c \
 	Optimizer/pass1.c \
 	Optimizer/pass3.c \

ext/opcache/ZendAccelerator.c

@@ -4693,9 +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_TIMERS
-				zend_timers_startup();
-#endif
+				zend_timer_init();
+
 				in_child = 1;
 			} else { /* parent */
 				int status;

ext/pcntl/pcntl.c

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

sapi/apache2handler/sapi_apache2.c

@@ -753,13 +753,23 @@ static void php_apache_signal_init(apr_pool_t *pchild, server_rec *s)
 }
 #endif
 
+#ifdef ZEND_TIMERS
+static void php_apache_timers_init(apr_pool_t *pchild, server_rec *s)
+{
+	zend_timer_init();
+}
+#endif
+
 void php_ap2_register_hook(apr_pool_t *p)
 {
 	ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
 #ifdef ZEND_SIGNALS
 	ap_hook_child_init(php_apache_signal_init, NULL, NULL, APR_HOOK_MIDDLE);
+#endif
+#ifdef ZEND_TIMERS
+	ap_hook_child_init(php_apache_timers_init, NULL, NULL, APR_HOOK_MIDDLE);
 #endif
 	ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 }