Apple Network Framework Socket Changes

source/channel_bootstrap.c

@@ -568,6 +568,11 @@ static void s_socket_shutdown_complete_setup_connection_args_fn(void *user_data)
     struct socket_shutdown_setup_channel_args *shutdown_args = user_data;
     struct client_connection_args *connection_args = shutdown_args->connection_args;
 
+    // The failed count should be set before validation
+    if (shutdown_args->error_code || !connection_args->channel_data.channel) {
+        connection_args->failed_count++;
+    }
+
     /* if this is the last attempted connection and it failed, notify the user */
     if (connection_args->failed_count == connection_args->addresses_count) {
         AWS_LOGF_ERROR(
@@ -600,10 +605,6 @@ static void s_on_client_connection_established(struct aws_socket *socket, int er
         (void *)socket,
         error_code);
 
-    if (error_code) {
-        connection_args->failed_count++;
-    }
-
     struct aws_allocator *allocator = connection_args->bootstrap->allocator;
 
     if (error_code || connection_args->connection_chosen) {
@@ -681,8 +682,6 @@ static void s_on_client_connection_established(struct aws_socket *socket, int er
             false)
         aws_socket_clean_up(socket);
         aws_mem_release(connection_args->bootstrap->allocator, connection_args->channel_data.socket);
-        connection_args->failed_count++;
-
     } else {
         s_connection_args_creation_callback(connection_args, connection_args->channel_data.channel);
     }

source/darwin/nw_socket.c

@@ -581,7 +581,7 @@ static void s_process_socket_cancel_task(struct aws_task *task, void *arg, enum
     struct nw_socket_cancel_task_args *args = arg;
     struct nw_socket *nw_socket = args->nw_socket;
 
-    AWS_LOGF_DEBUG(AWS_LS_IO_SOCKET, "id=%p: written finished closing", (void *)nw_socket);
+    AWS_LOGF_TRACE(AWS_LS_IO_SOCKET, "id=%p: start to process socket cancel task.", (void *)nw_socket);
 
     // The task should always run event when status == AWS_TASK_STATUS_CANCELLED. We rely on the task to clean up the
     // system connection/listener. And release the socket memory.
@@ -672,7 +672,7 @@ int aws_socket_init_apple_nw_socket(
 
     // Network Interface is not supported with Apple Network Framework yet
     if (options->network_interface_name[0] != 0) {
-        AWS_LOGF_ERROR(
+        AWS_LOGF_DEBUG(
             AWS_LS_IO_SOCKET,
             "id=%p fd=%d: network_interface_name is not supported on this platform.",
             (void *)socket,
@@ -764,7 +764,7 @@ static void s_process_incoming_data_task(struct aws_task *task, void *arg, enum
 
     AWS_LOGF_TRACE(
         AWS_LS_IO_SOCKET,
-        "id=%p handle=%p: start process read data.",
+        "id=%p handle=%p: start to process read data.",
         (void *)nw_socket,
         (void *)nw_socket->os_handle.nw_connection);
 
@@ -847,6 +847,8 @@ static void s_process_connection_result_task(struct aws_task *task, void *arg, e
     struct nw_socket_scheduled_task_args *task_args = arg;
     struct nw_socket *nw_socket = task_args->nw_socket;
 
+    AWS_LOGF_TRACE(AWS_LS_IO_SOCKET, "id=%p: start to process connection result task.", (void *)nw_socket);
+
     if (status != AWS_TASK_STATUS_CANCELED) {
         s_lock_base_socket(nw_socket);
         struct aws_socket *socket = nw_socket->base_socket_synced_data.base_socket;
@@ -1209,6 +1211,8 @@ static void s_process_write_task(struct aws_task *task, void *args, enum aws_tas
     struct aws_allocator *allocator = task_args->allocator;
     struct nw_socket *nw_socket = task_args->nw_socket;
 
+    AWS_LOGF_TRACE(AWS_LS_IO_SOCKET, "id=%p: start to process write task.", (void *)nw_socket);
+
     if (status != AWS_TASK_STATUS_CANCELED) {
         s_lock_base_socket(nw_socket);
         struct aws_socket *socket = nw_socket->base_socket_synced_data.base_socket;
@@ -1574,6 +1578,12 @@ static void s_process_listener_state_changed_task(struct aws_task *task, void *a
     nw_listener_state_t state = listener_state_changed_args->state;
     int crt_error_code = listener_state_changed_args->error;
 
+    AWS_LOGF_TRACE(
+        AWS_LS_IO_SOCKET,
+        "id=%p handle=%p: start to process listener state change task.",
+        (void *)nw_socket,
+        (void *)nw_listener);
+
     /* Ideally we should not have a canceled task here, as nw_socket keeps a reference to event loop, therefore the
      * event loop should never be destroyed before the nw_socket get destroyed. If we manually cancel the task, we
      * should make sure we carefully handled the state change eventually, as the socket relies on this task to release
@@ -1945,7 +1955,7 @@ static int s_schedule_next_read(struct nw_socket *nw_socket) {
     // Once a read operation is scheduled, we should not schedule another one until the current one is
     // completed.
     if (nw_socket->synced_data.read_scheduled) {
-        AWS_LOGF_ERROR(
+        AWS_LOGF_TRACE(
             AWS_LS_IO_SOCKET,
             "id=%p handle=%p: there is already read queued, do not queue further read",
             (void *)nw_socket,
@@ -1955,7 +1965,7 @@ static int s_schedule_next_read(struct nw_socket *nw_socket) {
     }
 
     if (nw_socket->synced_data.state & CLOSING || !(nw_socket->synced_data.state & CONNECTED_READ)) {
-        AWS_LOGF_ERROR(
+        AWS_LOGF_DEBUG(
             AWS_LS_IO_SOCKET,
             "id=%p handle=%p: cannot read to because socket is not connected",
             (void *)nw_socket,
@@ -2042,7 +2052,7 @@ static int s_socket_read_fn(struct aws_socket *socket, struct aws_byte_buf *read
             socket->io_handle.data.handle);
         s_lock_socket_synced_data(nw_socket);
         if (!(nw_socket->synced_data.state & CONNECTED_READ)) {
-            AWS_LOGF_ERROR(
+            AWS_LOGF_DEBUG(
                 AWS_LS_IO_SOCKET,
                 "id=%p handle=%p: socket is not connected to read.",
                 (void *)socket,
@@ -2172,7 +2182,7 @@ static int s_socket_write_fn(
     struct nw_socket *nw_socket = socket->impl;
     s_lock_socket_synced_data(nw_socket);
     if (!(nw_socket->synced_data.state & CONNECTED_WRITE)) {
-        AWS_LOGF_ERROR(
+        AWS_LOGF_DEBUG(
             AWS_LS_IO_SOCKET,
             "id=%p handle=%p: cannot write to because it is not connected",
             (void *)socket,