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

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

File:

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

uspace/srv/net/tcp/sock.c

@@ -114 +114 @@
         *rsock = NULL;
 
-        sock = calloc(sizeof(tcp_sockdata_t), 1);
+        sock = calloc(1, sizeof(tcp_sockdata_t));
         if (sock == NULL)
                 return ENOMEM;
@@ -277 +277 @@
 
         socket->backlog = backlog;
-        socket->lconn = calloc(sizeof(tcp_conn_t *), backlog);
+        socket->lconn = calloc(backlog, sizeof(tcp_conn_t *));
         if (socket->lconn == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -293 +293 @@
         for (i = 0; i < backlog; i++) {
 
-                lconn = calloc(sizeof(tcp_sock_lconn_t), 1);
+                lconn = calloc(1, sizeof(tcp_sock_lconn_t));
                 if (lconn == NULL) {
                         /* XXX Clean up */
@@ -779 +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);
@@ -839 +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);
@@ -852 +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;
                 }
@@ -861 +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);