Changeset 90478727 in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/tcp/sock.c (modified) (5 diffs)

uspace/srv/net/tcp/sock.c

@@ -151 +151 @@
             sock, sock_id);
 
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_destroy(sock->recv_fibril);
+                sock->recv_fibril = 0;
                 return rc;
+        }
 
         sock_core = socket_cores_find(&sock->client->sockets, *sock_id);
@@ -776 +779 @@
         }
 
+        /* Grab recv_buffer_lock because of CV wait in tcp_sock_recv_fibril() */
+        fibril_mutex_lock(&socket->recv_buffer_lock);
+        socket->sock_core = NULL;
+        fibril_mutex_unlock(&socket->recv_buffer_lock);
+
         rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             tcp_free_sock_data);
@@ -836 +844 @@
         log_msg(LVL_DEBUG, "tcp_sock_recv_fibril()");
 
+        fibril_mutex_lock(&sock->recv_buffer_lock);
+
         while (true) {
                 log_msg(LVL_DEBUG, "call tcp_uc_receive()");
-                fibril_mutex_lock(&sock->recv_buffer_lock);
-                while (sock->recv_buffer_used != 0)
+                while (sock->recv_buffer_used != 0 && sock->sock_core != NULL)
                         fibril_condvar_wait(&sock->recv_buffer_cv,
                             &sock->recv_buffer_lock);
@@ -849 +858 @@
                         sock->recv_error = trc;
                         fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                        fibril_mutex_unlock(&sock->recv_buffer_lock);
-                        tcp_sock_notify_data(sock->sock_core);
+                        if (sock->sock_core != NULL)
+                                tcp_sock_notify_data(sock->sock_core);
                         break;
                 }
@@ -858 +867 @@
                 sock->recv_buffer_used = data_len;
                 fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                fibril_mutex_unlock(&sock->recv_buffer_lock);
-                tcp_sock_notify_data(sock->sock_core);
-        }
+                if (sock->sock_core != NULL)
+                        tcp_sock_notify_data(sock->sock_core);
+        }
+
+        fibril_mutex_unlock(&sock->recv_buffer_lock);
 
         tcp_uc_delete(sock->conn);