php#53: - Add 'nonblocking_applied' flag to php_netstream_data_t to track the

         actual socket state at OS level
       - Modify network_async_set_socket_blocking() to check current state
         before making system calls, avoiding redundant fcntl() operations
       - Update function calls in xp_socket.c to pass socket structure for
         state tracking
       - Initialize the flag to false (blocking mode) in socket factory

Author: EdmondDantes

main/network_async.c

@@ -32,12 +32,26 @@
 
 /**
  * Sets a socket to blocking (true) or non-blocking (false) mode.
+ * Optimized to avoid redundant fcntl() calls by tracking the actual socket state.
  *
  * @param socket
  * @param blocking
+ * @param sock_data
  */
-void network_async_set_socket_blocking(php_socket_t socket, bool blocking)
+void network_async_set_socket_blocking(php_socket_t socket, bool blocking, php_netstream_data_t *sock_data)
 {
+	// Optimization: avoid redundant system calls if the socket is already in the desired mode
+	if (sock_data != NULL) {
+		if (!blocking && sock_data->nonblocking_applied) {
+			// Already in non-blocking mode, skip system call
+			return;
+		}
+		if (blocking && !sock_data->nonblocking_applied) {
+			// Already in blocking mode, skip system call
+			return;
+		}
+	}
+
 #ifdef PHP_WIN32
 	u_long mode = blocking ? 0 : 1;
 
@@ -47,6 +61,7 @@ void network_async_set_socket_blocking(php_socket_t socket, bool blocking)
 			ZEND_ASYNC_EXCEPTION_DEFAULT,
 			"ioctlsocket(FIONBIO) failed (WSA error %d)", err
 		);
+		return;
 	}
 #else
 	int flags = fcntl(socket, F_GETFL, 0);
@@ -67,8 +82,14 @@ void network_async_set_socket_blocking(php_socket_t socket, bool blocking)
 			ZEND_ASYNC_EXCEPTION_DEFAULT,
 			"fcntl(F_SETFL) failed: %s", strerror(errno)
 		);
+		return;
 	}
 #endif
+
+	// Update the flag to reflect the actual socket state
+	if (sock_data != NULL) {
+		sock_data->nonblocking_applied = !blocking;
+	}
 }
 
 bool network_async_ensure_socket_nonblocking(php_socket_t socket)

main/network_async.h

@@ -20,7 +20,7 @@
 
 BEGIN_EXTERN_C()
 
-ZEND_API void network_async_set_socket_blocking(php_socket_t socket, bool blocking);
+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);
 

main/php_network.h

@@ -330,6 +330,7 @@ struct _php_netstream_data_t	{
 	bool timeout_event;
 	struct timeval timeout;
 	size_t ownsize;
+	bool nonblocking_applied;
 };
 typedef struct _php_netstream_data_t php_netstream_data_t;
 PHPAPI extern const php_stream_ops php_stream_socket_ops;

main/streams/xp_socket.c

@@ -71,8 +71,8 @@ static ssize_t php_sockop_write(php_stream *stream, const char *buf, size_t coun
 	else
 		ptimeout = &sock->timeout;
 
-	if (ZEND_ASYNC_IS_ACTIVE && sock->is_blocked) {
-		network_async_set_socket_blocking(sock->socket, false);
+	if (ZEND_ASYNC_IS_ACTIVE && sock->is_blocked && !sock->nonblocking_applied) {
+		network_async_set_socket_blocking(sock->socket, false, sock);
 		if (UNEXPECTED(EG(exception) != NULL)) {
 			/* If we are in async context and an exception was thrown, we should not continue. */
 			return -1;
@@ -126,8 +126,8 @@ static ssize_t php_sockop_write(php_stream *stream, const char *buf, size_t coun
 		php_stream_notify_progress_increment(PHP_STREAM_CONTEXT(stream), didwrite, 0);
 	}
 
-	if (ZEND_ASYNC_IS_ACTIVE && sock->is_blocked) {
-		network_async_set_socket_blocking(sock->socket, true);
+	if (ZEND_ASYNC_IS_ACTIVE && sock->is_blocked && !sock->nonblocking_applied) {
+		network_async_set_socket_blocking(sock->socket, true, sock);
 		if (UNEXPECTED(EG(exception) != NULL)) {
 			/* If we are in async context and an exception was thrown, we should not continue. */
 			return -1;
@@ -982,6 +982,7 @@ PHPAPI php_stream *php_stream_generic_socket_factory(const char *proto, size_t p
 	sock->is_blocked = true;
 	sock->timeout.tv_sec = FG(default_socket_timeout);
 	sock->timeout.tv_usec = 0;
+	sock->nonblocking_applied = false;
 
 	/* we don't know the socket until we have determined if we are binding or
 	 * connecting */