store pid

Author: dunglas

Zend/zend_globals.h

@@ -22,6 +22,7 @@
 
 
 #include <setjmp.h>
+#include <sys/types.h>
 
 #include "zend_globals_macros.h"
 
@@ -269,6 +270,7 @@ struct _zend_executor_globals {
 
 #ifdef ZEND_TIMERS
 	timer_t timer;
+	pid_t pid;
 	struct sigaction oldact;
 #endif
 

Zend/zend_timer.c

@@ -47,6 +47,7 @@ ZEND_API void zend_timer_init(void) /* {{{ */
 	sev.sigev_signo = SIGIO;
 	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_REALTIME, &sev, &EG(timer)) != 0) {
 		zend_strerror_noreturn(E_ERROR, errno, "Could not create timer");
@@ -80,6 +81,11 @@ void zend_timer_settime(zend_long seconds) /* {{{ }*/
 
 void zend_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);
 	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. */

ext/opcache/ZendAccelerator.c

@@ -4693,8 +4693,6 @@ static int accel_finish_startup(void)
 					zend_accel_error(ACCEL_LOG_WARNING, "Preloading failed to setuid(%d)", pw->pw_uid);
 					exit(1);
 				}
-				zend_timer_init();
-
 				in_child = 1;
 			} else { /* parent */
 				int status;

sapi/apache2handler/sapi_apache2.c

@@ -753,23 +753,13 @@ 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);
 }

sapi/cgi/cgi_main.c

@@ -2053,7 +2053,6 @@ consult the installation file that came with this distribution, or visit \n\
 						sigaction(SIGQUIT, &old_quit, 0);
 						sigaction(SIGINT,  &old_int,  0);
 						zend_signal_init();
-						zend_timer_init();
 						break;
 					case -1:
 						perror("php (pre-forking)");

sapi/cli/php_cli_server.c

@@ -64,7 +64,6 @@
 #include "zend_execute.h"
 #include "zend_highlight.h"
 #include "zend_exceptions.h"
-#include "zend_timer.h"
 
 #include "php_getopt.h"
 
@@ -2401,8 +2400,6 @@ static void php_cli_server_startup_workers(void) {
 			} else if (pid == SUCCESS) {
 				return;
 			} else {
-				zend_timer_init();
-
 				php_cli_server_workers[php_cli_server_worker] = pid;
 			}
 		}

sapi/fpm/fpm/fpm_php.c

@@ -11,8 +11,6 @@
 #include "php_ini.h"
 #include "ext/standard/dl.h"
 
-#include "zend_timer.h"
-
 #include "fastcgi.h"
 
 #include "fpm.h"
@@ -216,7 +214,6 @@ int fpm_php_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 		0 > fpm_php_set_allowed_clients(wp)) {
 		return -1;
 	}
-	zend_timer_init();
 
 	if (wp->limit_extensions) {
 		/* Take ownership of limit_extensions. */