Combine zend_fiber_run and zend_fiber_execute

Author: trowski

Zend/zend_fibers.c

@@ -334,31 +334,7 @@ static zend_always_inline zend_vm_stack zend_fiber_vm_stack_alloc(size_t size) /
 }
 /* }}} */
 
-static void zend_fiber_execute(zend_fiber *fiber) /* {{{ */
-{
-	fiber->fci.retval = &fiber->value;
-
-	zend_call_function(&fiber->fci, &fiber->fci_cache);
-
-	if (EG(exception)) {
-		if (fiber->status == ZEND_FIBER_STATUS_SHUTDOWN) {
-			if (EXPECTED(zend_is_fiber_exit(EG(exception)))) {
-				zend_clear_exception();
-			} else {
-				zend_exception_error(EG(exception), E_ERROR);
-			}
-		} else {
-			fiber->status = ZEND_FIBER_STATUS_THREW;
-		}
-	} else {
-		fiber->status = ZEND_FIBER_STATUS_RETURNED;
-	}
-
-	GC_DELREF(&fiber->std);
-}
-/* }}} */
-
-static void zend_fiber_run(zend_fiber_context *context) /* {{{ */
+static void zend_fiber_execute(zend_fiber_context *context) /* {{{ */
 {
 	zend_fiber *fiber = EG(current_fiber);
 	ZEND_ASSERT(fiber);
@@ -382,10 +358,32 @@ static void zend_fiber_run(zend_fiber_context *context) /* {{{ */
 	EG(jit_trace_num) = 0;
 	EG(error_reporting) = error_reporting;
 
-	zend_fiber_execute(fiber);
+	fiber->fci.retval = &fiber->value;
+
+	// Reference added while running, removed when suspended, and added again once resumed.
+	GC_ADDREF(&fiber->std);
+
+	zend_call_function(&fiber->fci, &fiber->fci_cache);
+
+	if (EG(exception)) {
+		if (fiber->status == ZEND_FIBER_STATUS_SHUTDOWN) {
+			if (EXPECTED(zend_is_fiber_exit(EG(exception)))) {
+				zend_clear_exception();
+			} else {
+				zend_exception_error(EG(exception), E_ERROR);
+			}
+		} else {
+			fiber->status = ZEND_FIBER_STATUS_THREW;
+		}
+	} else {
+		fiber->status = ZEND_FIBER_STATUS_RETURNED;
+	}
 
 	zend_vm_stack_destroy();
 	fiber->execute_data = NULL;
+
+	// Remove reference added at last resume.
+	GC_DELREF(&fiber->std);
 }
 /* }}} */
 
@@ -474,15 +472,13 @@ ZEND_METHOD(Fiber, start)
 	fiber->fci.params = ZEND_CALL_ARG(execute_data, 1);
 	fiber->fci.param_count = ZEND_CALL_NUM_ARGS(execute_data);
 
-	if (!zend_fiber_init_context(&fiber->context, zend_fiber_run, EG(fiber_stack_size))) {
+	if (!zend_fiber_init_context(&fiber->context, zend_fiber_execute, EG(fiber_stack_size))) {
 		zend_throw_error(NULL, "Could not create fiber context");
 		return;
 	}
 
 	fiber->status = ZEND_FIBER_STATUS_RUNNING;
 
-	GC_ADDREF(&fiber->std);
-
 	zend_fiber_switch_to(fiber);
 
 	zval_ptr_dtor(&fiber->fci.function_name);
@@ -530,6 +526,7 @@ ZEND_METHOD(Fiber, suspend)
 	fiber->execute_data = execute_data;
 	fiber->status = ZEND_FIBER_STATUS_SUSPENDED;
 
+	// Remove running reference while suspended.
 	GC_DELREF(&fiber->std);
 
 	zend_fiber_suspend(fiber);
@@ -541,6 +538,7 @@ ZEND_METHOD(Fiber, suspend)
 	}
 
 	fiber->status = ZEND_FIBER_STATUS_RUNNING;
+	// Add reference while fiber is running.
 	GC_ADDREF(&fiber->std);
 
 	if (!fiber->error) {