php#53: Refactor network_async_await_stream_socket to use unified event handling

       This commit addresses architectural inconsistencies in async socket event
       management by unifying the approach used across the codebase.

       Changes:
       - Modified network_async_await_stream_socket() to accept php_stream* instead
         of php_netstream_data_t*, enabling access to the standard Stream API
       - Replaced direct ZEND_ASYNC_NEW_SOCKET_EVENT() calls with unified
         php_stream_set_option(PHP_STREAM_OPTION_ASYNC_EVENT_HANDLE) approach
       - Updated all call sites in xp_socket.c to pass stream instead of sock data
       - Ensured consistent event handle creation/retrieval across all async operations

Author: EdmondDantes

main/network_async.c

@@ -204,18 +204,17 @@ static void socket_await_callback_resolve(
 }
 
 /**
- * Asynchronous await for single socket with reusable event handle.
+ * Asynchronous await for single socket stream with reusable event handle.
  *
- * This function provides optimized async I/O waiting for a single socket by reusing
- * the event handle stored in the socket structure, avoiding repeated
- * ZEND_ASYNC_NEW_SOCKET_EVENT allocations.
+ * This function provides optimized async I/O waiting for a single socket stream by using
+ * the unified php_stream_set_option approach for event handle management.
  *
- * @param sock      Socket data structure containing event handle
+ * @param stream    PHP stream (must be a socket stream)
  * @param events    Poll events (POLLIN, POLLOUT, etc.)
  * @param timeout   Timeout as struct timeval* (NULL for infinite)
  * @return          1 if events occurred, 0 on timeout, -1 on error
  */
-ZEND_API int network_async_await_stream_socket(php_netstream_data_t *sock, short events, struct timeval *timeout)
+ZEND_API int network_async_await_stream_socket(php_stream *stream, short events, struct timeval *timeout)
 {
 	zend_coroutine_t *coroutine = ZEND_ASYNC_CURRENT_COROUTINE;
 
@@ -224,21 +223,25 @@ ZEND_API int network_async_await_stream_socket(php_netstream_data_t *sock, short
 		return -1;
 	}
 
-	if (sock == NULL || sock->socket == -1) {
+	if (stream == NULL) {
 		errno = EBADF;
 		return -1;
 	}
 
-	// Create or reuse event handle
-	if (sock->poll_event == NULL) {
-		sock->poll_event = ZEND_ASYNC_NEW_SOCKET_EVENT(
-			sock->socket, poll2_events_to_async(events)
-		);
-
-		if (UNEXPECTED(EG(exception) != NULL || sock->poll_event == NULL)) {
-			errno = ENOMEM;
-			return -1;
-		}
+	// Use unified approach: get event handle via php_stream_set_option
+	zend_async_poll_event_t *poll_event = NULL;
+	zend_ulong async_events = poll2_events_to_async(events);
+	
+	php_stream_set_option(stream, PHP_STREAM_OPTION_ASYNC_EVENT_HANDLE, async_events, &poll_event);
+	
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		handle_exception_and_errno();
+		return -1;
+	}
+	
+	if (UNEXPECTED(poll_event == NULL)) {
+		errno = ENOTSUP;  // Stream doesn't support async operations
+		return -1;
 	}
 
 	// Convert timeval timeout to milliseconds for async waker
@@ -257,7 +260,7 @@ ZEND_API int network_async_await_stream_socket(php_netstream_data_t *sock, short
 	// Register the event
 	zend_async_resume_when(
 		coroutine,
-		&sock->poll_event->base,
+		&poll_event->base,
 		false,
 		socket_await_callback_resolve,
 		NULL

main/network_async.h

@@ -23,7 +23,7 @@ BEGIN_EXTERN_C()
 ZEND_API void network_async_set_socket_blocking(php_socket_t socket, bool blocking, php_netstream_data_t *sock_data);
 ZEND_API bool network_async_ensure_socket_nonblocking(php_socket_t socket);
 ZEND_API void network_async_wait_socket(php_socket_t socket, const zend_ulong events, const zend_ulong timeout);
-ZEND_API int network_async_await_stream_socket(php_netstream_data_t *sock, short events, struct timeval *timeout);
+ZEND_API int network_async_await_stream_socket(php_stream *stream, short events, struct timeval *timeout);
 
 ZEND_API int php_poll2_async(php_pollfd *ufds, unsigned int nfds, int timeout);
 ZEND_API int php_select_async(php_socket_t max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv);

main/streams/xp_socket.c

@@ -92,7 +92,7 @@ static ssize_t php_sockop_write(php_stream *stream, const char *buf, size_t coun
 				sock->timeout_event = false;
 
 				if (ZEND_ASYNC_IS_ACTIVE) {
-					retval = network_async_await_stream_socket(sock, POLLOUT, ptimeout);
+                retval = network_async_await_stream_socket(stream, POLLOUT, ptimeout);
 
 					if (retval == 0) {
 						sock->timeout_event = true;
@@ -172,7 +172,7 @@ static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data
 	}
 
 	if (ZEND_ASYNC_IS_ACTIVE) {
-		retval = network_async_await_stream_socket(sock, PHP_POLLREADABLE, ptimeout);
+		retval = network_async_await_stream_socket(stream, PHP_POLLREADABLE, ptimeout);
 
 		if (retval == 0) {
 			sock->timeout_event = true;
@@ -410,7 +410,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 						((MSG_DONTWAIT != 0) || !sock->is_blocked)
 					) ||
 					(ZEND_ASYNC_IS_ACTIVE ? 
-						network_async_await_stream_socket(sock, PHP_POLLREADABLE|POLLPRI, &tv) > 0 :
+						network_async_await_stream_socket(stream, PHP_POLLREADABLE|POLLPRI, &tv) > 0 :
 						php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0)
 				) {
 					/* the poll() call was skipped if the socket is non-blocking (or MSG_DONTWAIT is available) and if the timeout is zero */