Arnaud's review

Author: dunglas

Zend/zend_execute_API.c

@@ -1403,19 +1403,19 @@ ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void) /* {{{ */
 # ifdef ZEND_MAX_EXECUTION_TIMERS
 static void zend_timeout_handler(int dummy, siginfo_t *si, void *uc) /* {{{ */
 {
-#ifdef ZTS
+#  ifdef ZTS
 	if (!tsrm_is_managed_thread()) {
 		fprintf(stderr, "zend_timeout_handler() called in a thread not managed by PHP. The expected signal handler will not be called. This is probably a bug.\n");
 
 		return;
 	}
-#endif
+#  endif
 
-#ifndef __APPLE__
+#  ifndef __APPLE__
 	if (si->si_value.sival_ptr != &EG(max_execution_timer_timer)) {
-#ifdef MAX_EXECUTION_TIMERS_DEBUG
+#   ifdef MAX_EXECUTION_TIMERS_DEBUG
 		fprintf(stderr, "Executing previous handler (if set) for unexpected signal SIGRTMIN received on thread %d\n", (pid_t) syscall(SYS_gettid));
-#endif
+#   endif
 
 		if (EG(oldact).sa_sigaction) {
 			EG(oldact).sa_sigaction(dummy, si, uc);
@@ -1426,7 +1426,7 @@ static void zend_timeout_handler(int dummy, siginfo_t *si, void *uc) /* {{{ */
 
 		return;
 	}
-#endif
+#  endif /* ifndef __APPLE__ */
 # else
 static void zend_timeout_handler(int dummy) /* {{{ */
 {

Zend/zend_globals.h

@@ -303,7 +303,7 @@ struct _zend_executor_globals {
 
 #ifdef ZEND_MAX_EXECUTION_TIMERS
 # ifdef __APPLE__
-	dispatch_source_t max_execution_timer_timer;
+	dispatch_source_t max_execution_timer_source;
 	bool max_execution_timer_suspended;
 # else
 	timer_t max_execution_timer_timer;

Zend/zend_max_execution_timer.c

@@ -55,8 +55,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 	}
 
 	dispatch_queue_global_t queue = dispatch_get_global_queue(QOS_CLASS_UTILITY, 0);
-	EG(max_execution_timer_timer) = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
-	if (EG(max_execution_timer_timer) == NULL) {
+	EG(max_execution_timer_source) = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+	if (EG(max_execution_timer_source) == NULL) {
 		zend_strerror_noreturn(E_ERROR, errno, "Could not create dispatch source");
 	}
 
@@ -67,36 +67,36 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 	pthread_t tid = pthread_self();
 	pthread_t *ptid = malloc(sizeof(pthread_t));
 	memcpy(ptid, &tid, sizeof(pthread_t));
-	dispatch_set_context(EG(max_execution_timer_timer), ptid);
+	dispatch_set_context(EG(max_execution_timer_source), ptid);
 #else
 	pid_t *ppid = malloc(sizeof(pid_t));
 	*ppid = pid;
-	dispatch_set_context(EG(max_execution_timer_timer), ppid);
+	dispatch_set_context(EG(max_execution_timer_source), ppid);
 #  endif
 
-	dispatch_source_set_event_handler_f(EG(max_execution_timer_timer), zend_max_execution_timer_handler);
-	dispatch_source_set_cancel_handler_f(EG(max_execution_timer_timer), zend_max_execution_timer_cancel);
+	dispatch_source_set_event_handler_f(EG(max_execution_timer_source), zend_max_execution_timer_handler);
+	dispatch_source_set_cancel_handler_f(EG(max_execution_timer_source), zend_max_execution_timer_cancel);
 } /* }}} */
 
 void zend_max_execution_timer_settime(zend_long seconds) /* {{{ */
 {
 	if (seconds == 0) {
 		if (!EG(max_execution_timer_suspended)) {
-			dispatch_suspend(EG(max_execution_timer_timer));
+			dispatch_suspend(EG(max_execution_timer_source));
 			EG(max_execution_timer_suspended) = 1;
 		}
 
 		return;
 	}
 
 	dispatch_source_set_timer(
-		EG(max_execution_timer_timer),
+		EG(max_execution_timer_source),
 		dispatch_time(DISPATCH_TIME_NOW, seconds * NSEC_PER_SEC),
 		seconds * NSEC_PER_SEC,
 		0
 	);
 	if (EG(max_execution_timer_suspended)) {
-		dispatch_resume(EG(max_execution_timer_timer));
+		dispatch_resume(EG(max_execution_timer_source));
 		EG(max_execution_timer_suspended) = 0;
 	}
 } /* }}} */
@@ -110,8 +110,8 @@ void zend_max_execution_timer_shutdown(void) /* {{{ */
 
 	EG(pid) = 0;
 
-	dispatch_source_cancel(EG(max_execution_timer_timer));
-	//dispatch_release(EG(max_execution_timer_timer));
+	dispatch_source_cancel(EG(max_execution_timer_source));
+	//dispatch_release(EG(max_execution_timer_source));
 } /* }}} */
 
 # else

Zend/zend_max_execution_timer.h

@@ -22,7 +22,7 @@
 #include "zend_long.h"
 
 #  ifdef __APPLE__
-#define ZEND_MAX_EXECUTION_TIMERS_SIGNAL SIGALRM
+#define ZEND_MAX_EXECUTION_TIMERS_SIGNAL SIGIO
 #  else
 #define ZEND_MAX_EXECUTION_TIMERS_SIGNAL SIGRTMIN
 #  endif