reduce API surface

Author: dunglas

Zend/zend.c

@@ -823,15 +823,15 @@ 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_create();
+	zend_timers_startup();
 #endif
 }
 /* }}} */
 
 static void zend_thread_shutdown_handler(void) { /* {{{ */
 	zend_interned_strings_dtor();
 #ifdef ZEND_TIMERS
-	zend_timers_delete();
+	zend_timers_shutdown();
 #endif
 }
 /* }}} */

Zend/zend_execute_API.c

@@ -174,7 +174,7 @@ void init_executor(void) /* {{{ */
 	EG(vm_interrupt) = 0;
 	EG(timed_out) = 0;
 #ifdef ZEND_TIMERS
-	zend_timers_create();
+	zend_timers_startup();
 #endif
 
 	EG(exception) = NULL;

Zend/zend_timers.c

@@ -33,7 +33,7 @@
 # define sigev_notify_thread_id _sigev_un._tid
 # endif
 
-ZEND_API void zend_timers_create(void) /* {{{ */
+ZEND_API void zend_timers_startup(void) /* {{{ */
 {
 	struct sigevent sev;
 	sev.sigev_notify = SIGEV_THREAD_ID;
@@ -47,6 +47,7 @@ ZEND_API void zend_timers_create(void) /* {{{ */
 	sev.sigev_signo = SIGIO;
 	sev.sigev_notify_thread_id = (pid_t) syscall(SYS_gettid);
 
+	// 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");
 	}
@@ -59,7 +60,7 @@ ZEND_API void zend_timers_create(void) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void zend_timers_settime(zend_long seconds) /* {{{ }*/
+void zend_timers_settime(zend_long seconds) /* {{{ }*/
 {
 	timer_t timer = EG(timer);
 
@@ -77,7 +78,7 @@ ZEND_API void zend_timers_settime(zend_long seconds) /* {{{ }*/
 }
 /* }}} */
 
-ZEND_API void zend_timers_delete(void) /* {{{ */
+void zend_timers_shutdown(void) /* {{{ */
 {
 	timer_t timer = EG(timer);
 	if (timer == (timer_t){0}) {

Zend/zend_timers.h

@@ -21,9 +21,9 @@
 
 #include "zend_long.h"
 
-ZEND_API void zend_timers_create(void);
-ZEND_API void zend_timers_settime(zend_long seconds);
-ZEND_API void zend_timers_delete(void);
+ZEND_API void zend_timers_startup(void);
+void zend_timers_settime(zend_long seconds);
+void zend_timers_shutdown(void);
 
 # endif
 #endif

ext/opcache/ZendAccelerator.c

@@ -4694,7 +4694,7 @@ static int accel_finish_startup(void)
 					exit(1);
 				}
 #ifdef ZEND_TIMERS
-				zend_timers_create();
+				zend_timers_startup();
 #endif
 				in_child = 1;
 			} else { /* parent */

ext/pcntl/pcntl.c

@@ -535,7 +535,7 @@ PHP_FUNCTION(pcntl_fork)
 		php_error_docref(NULL, E_WARNING, "Error %d", errno);
 	} else if (id == 0) {
 		#ifdef ZEND_TIMERS
-			zend_timers_create();
+			zend_timers_startup();
 		#endif
 	}
 

sapi/cgi/cgi_main.c

@@ -2055,7 +2055,7 @@ consult the installation file that came with this distribution, or visit \n\
 						zend_signal_init();
 
 #if ZEND_TIMERS
-	zend_timers_create();
+	zend_timers_startup();
 #endif
 						break;
 					case -1:

sapi/cli/php_cli_server.c

@@ -2402,7 +2402,7 @@ static void php_cli_server_startup_workers(void) {
 				return;
 			} else {
 #if ZEND_TIMERS
-	zend_timers_create();
+	zend_timers_startup();
 #endif
 
 				php_cli_server_workers[php_cli_server_worker] = pid;

sapi/fpm/fpm/fpm_php.c

@@ -218,7 +218,7 @@ int fpm_php_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 	}
 
 #if ZEND_TIMERS
-	zend_timers_create();
+	zend_timers_startup();
 #endif
 
 	if (wp->limit_extensions) {