#19: * Memory leaks have been fixed in the await operator and its derivatives.

Author: EdmondDantes

async_API.c

@@ -299,11 +299,10 @@ void async_waiting_callback_dispose(zend_async_event_callback_t *callback, zend_
 
 	await_callback->await_context = NULL;
 
-	if (await_context == NULL) {
-		return;
+	if (await_context != NULL) {
+		await_context->dtor(await_context);
 	}
 
-	await_context->dtor(await_context);
 	await_callback->prev_dispose(callback, event);
 }
 
@@ -322,9 +321,9 @@ void async_waiting_callback(
 	// remove the callback from the event
 	// We remove the callback because we treat all events
 	// as FUTURE-type objects, where the trigger can be activated only once.
-	callback->ref_count++;
+	ZEND_ASYNC_EVENT_CALLBACK_ADD_REF(callback)
 	event->del_callback(event, callback);
-	callback->ref_count--;
+	ZEND_ASYNC_EVENT_CALLBACK_DEC_REF(callback)
 
 	if (exception != NULL) {
 		ZEND_ASYNC_EVENT_SET_EXCEPTION_HANDLED(event);
@@ -421,9 +420,9 @@ void async_waiting_cancellation_callback(
 	async_await_context_t * await_context = await_callback->await_context;
 
 	await_context->resolved_count++;
-	callback->ref_count++;
+	ZEND_ASYNC_EVENT_CALLBACK_ADD_REF(callback)
 	event->del_callback(event, callback);
-	callback->ref_count--;
+	ZEND_ASYNC_EVENT_CALLBACK_DEC_REF(callback)
 
 	if (exception != NULL) {
 		ZEND_ASYNC_EVENT_SET_EXCEPTION_HANDLED(event);

tests/await/008-awaitFirstSuccess_basic.phpt

@@ -25,36 +25,10 @@ $coroutines = [
 ];
 
 $result = awaitFirstSuccess($coroutines);
-var_dump($result);
-
+echo "Result: {$result[0]}\n";
 echo "end\n";
 ?>
 --EXPECTF--
 start
-array(2) {
-  [0]=>
-  string(7) "success"
-  [1]=>
-  array(1) {
-    [0]=>
-    object(RuntimeException)#%d (7) {
-      ["message":protected]=>
-      string(11) "first error"
-      ["string":"Exception":private]=>
-      string(0) ""
-      ["code":protected]=>
-      int(0)
-      ["file":protected]=>
-      string(%d) "%s"
-      ["line":protected]=>
-      int(%d)
-      ["trace":"Exception":private]=>
-      array(%d) {
-        %a
-      }
-      ["previous":"Exception":private]=>
-      NULL
-    }
-  }
-}
+Result: success
 end

tests/curl/002-concurrent_requests.phpt

@@ -12,8 +12,6 @@ use function Async\awaitAll;
 $server = async_test_server_start();
 
 function make_request($id, $server) {
-    echo "Request $id: starting\n";
-    
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, "http://localhost:{$server->port}/");
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -24,8 +22,14 @@ function make_request($id, $server) {
 
     curl_close($ch);
 
-    echo "Request $id: completed (HTTP $http_code)\n";
-    return "Request $id result: $response";
+    return [
+        'id' => $id,
+        'response' => $response,
+        'http_code' => $http_code,
+        'start_msg' => "Request $id: starting",
+        'complete_msg' => "Request $id: completed (HTTP $http_code)",
+        'result_msg' => "Request $id result: $response"
+    ];
 }
 
 echo "Test start\n";
@@ -39,8 +43,31 @@ $coroutines = [
 
 $results = awaitAll($coroutines);
 
+// Collect and sort messages
+$start_messages = [];
+$complete_messages = [];
+$result_messages = [];
+
 foreach ($results as $result) {
-    echo "Result: $result\n";
+    $start_messages[] = $result['start_msg'];
+    $complete_messages[] = $result['complete_msg'];
+    $result_messages[] = "Result: " . $result['result_msg'];
+}
+
+// Sort all messages by ID
+sort($start_messages);
+sort($complete_messages);
+sort($result_messages);
+
+// Output in consistent order
+foreach ($start_messages as $msg) {
+    echo $msg . "\n";
+}
+foreach ($complete_messages as $msg) {
+    echo $msg . "\n";
+}
+foreach ($result_messages as $msg) {
+    echo $msg . "\n";
 }
 
 echo "Test end\n";

tests/curl/009-curl_with_coroutines.phpt

@@ -13,8 +13,6 @@ use function Async\awaitAll;
 $server = async_test_server_start();
 
 function make_curl_request($server, $id) {
-    echo "Coroutine $id: starting\n";
-    
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, "http://localhost:{$server->port}/");
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -25,12 +23,12 @@ function make_curl_request($server, $id) {
 
     curl_close($ch);
 
-    echo "Coroutine $id: completed (HTTP $http_code)\n";
-    
     return [
         'id' => $id,
         'response' => $response,
-        'http_code' => $http_code
+        'http_code' => $http_code,
+        'start_msg' => "Coroutine $id: starting",
+        'complete_msg' => "Coroutine $id: completed (HTTP $http_code)"
     ];
 }
 
@@ -45,8 +43,31 @@ $coroutines = [
 
 $results = awaitAll($coroutines);
 
+// Collect and sort messages
+$start_messages = [];
+$complete_messages = [];
+$result_messages = [];
+
 foreach ($results as $result) {
-    echo "Result {$result['id']}: {$result['response']}\n";
+    $start_messages[] = $result['start_msg'];
+    $complete_messages[] = $result['complete_msg'];
+    $result_messages[] = "Result {$result['id']}: {$result['response']}";
+}
+
+// Sort all messages by ID
+sort($start_messages);
+sort($complete_messages);
+sort($result_messages);
+
+// Output in consistent order
+foreach ($start_messages as $msg) {
+    echo $msg . "\n";
+}
+foreach ($complete_messages as $msg) {
+    echo $msg . "\n";
+}
+foreach ($result_messages as $msg) {
+    echo $msg . "\n";
 }
 
 echo "Test end\n";