more debug details

Author: dunglas

Zend/zend.c

@@ -821,6 +821,10 @@ static void executor_globals_dtor(zend_executor_globals *executor_globals) /* {{
 # ifdef ZEND_TIMER
 static void zend_timer_create() /* {{{ */
 {
+#  ifdef TIMER_DEBUG
+		fprintf(stderr, "Trying to create timer on thread %d\n", (uintmax_t) EG(timer), sev.sigev_notify_thread_id);
+#  endif
+
 	struct sigevent sev;
 	sev.sigev_notify = SIGEV_THREAD_ID;
 	sev.sigev_value.sival_ptr = &EG(timer);
@@ -861,17 +865,17 @@ static void zend_thread_shutdown_handler(void) { /* {{{ */
 	zend_interned_strings_dtor();
 
 # ifdef ZEND_TIMER
-	timer_t timer = EG(timer);
+#  ifdef TIMER_DEBUG
+	fprintf(stderr, "Trying to delete timer %#jx thread %d\n", (uintmax_t) EG(timer), (pid_t) syscall(SYS_gettid));
+#  endif
 
-	if (timer == 0)
-		zend_error_noreturn(E_ERROR, "Could not c timer");
+	timer_t timer = EG(timer);
+	if (timer == 0) zend_error_noreturn(E_ERROR, "Timer not created");
 
-	if (timer_delete(timer) != 0)
+	int err = timer_delete(timer);
+	EG(timer) = 0;
+	if (err != 0)
 		zend_strerror_noreturn(E_ERROR, errno, "Could not delete timer");
-
-#  ifdef TIMER_DEBUG
-	fprintf(stderr, "Timer %#jx deleted on thread %d\n", (uintmax_t) EG(timer), (pid_t) syscall(SYS_gettid));
-#  endif
 # endif
 }
 /* }}} */

Zend/zend_execute_API.c

@@ -391,6 +391,11 @@ ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)
 static void zend_timer_settime(zend_long seconds) /* {{{ }*/
 {
 	timer_t timer = EG(timer);
+
+# ifdef TIMER_DEBUG
+	fprintf(stderr, "Trying to set timer %#jx on thread %d (%ld seconds)\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid), seconds);
+# endif
+
 	if (timer == 0) zend_error_noreturn(E_ERROR, "Timer not created");
 
 	struct itimerspec its;
@@ -399,10 +404,6 @@ static void zend_timer_settime(zend_long seconds) /* {{{ }*/
 
 	if (timer_settime(timer, 0, &its, NULL) != 0)
 		zend_strerror_noreturn(E_ERROR, errno, "Could not set timer");
-
-# ifdef TIMER_DEBUG
-	fprintf(stderr, "Timer %#jx set on thread %d (%ld seconds)\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid), seconds);
-# endif
 }
 /* }}} */
 #endif