remove thread-local variable

Author: withinboredom

Zend/zend_max_execution_timer.c

@@ -33,24 +33,20 @@
 # define sigev_notify_thread_id _sigev_un._tid
 # endif
 
-ZEND_TLS bool is_handler_set = false; // whether we have set up a timer in this thread
-
 ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 {
+	pid_t pid = getpid();
+
+	if (EG(pid) == pid) {
+		return;
+	}
+
 	struct sigevent sev;
 	sev.sigev_notify = SIGEV_THREAD_ID;
 	sev.sigev_value.sival_ptr = &EG(max_execution_timer_timer);
 	sev.sigev_signo = SIGRTMIN;
 	sev.sigev_notify_thread_id = (pid_t) syscall(SYS_gettid);
 
-	// Now check to see if a we've already set a signal handler
-	if(is_handler_set) {
-# ifdef MAX_EXECUTION_TIMERS_DEBUG
-		fprintf(stderr, "A max execution timer was already configured and will not be configured again on thread %d\n", sev.sigev_notify_thread_id);
-# endif
-		return;
-	}
-
 	// 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(max_execution_timer_timer)) != 0) {
 		zend_strerror_noreturn(E_ERROR, errno, "Could not create timer");
@@ -63,7 +59,6 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 # endif
 
 	sigaction(sev.sigev_signo, NULL, &EG(oldact));
-	is_handler_set = true;
 }
 /* }}} */
 
@@ -118,7 +113,6 @@ void zend_max_execution_timer_shutdown(void) /* {{{ */
 	if(sigaction(SIGRTMIN, &ign_sigrtmin, NULL) < 0) {
 		zend_strerror_noreturn(E_ERROR, errno, "Could not clear pending timer signal");
 	}
-	is_handler_set = false;
 }
 /* }}}} */