Changeset 141a20d in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2012-08-13T10:40:17Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a1e2df13

Parents:

e5e73af

Message:

Terminate UDP receive fibril when socket is closed.

File:

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

uspace/srv/net/udp/sock.c

@@ -531 +531 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "tcp_sock_close()");
+        log_msg(LVL_DEBUG, "udp_sock_close()");
         socket_id = SOCKET_GET_SOCKET_ID(call);
 
@@ -543 +543 @@
         fibril_mutex_lock(&socket->lock);
 
+        fibril_mutex_lock(&socket->recv_buffer_lock);
+        log_msg(LVL_DEBUG, "udp_sock_close - set socket->sock_core = NULL");
+        socket->sock_core = NULL;
+        fibril_mutex_unlock(&socket->recv_buffer_lock);
+
+        udp_uc_reset(socket->assoc);
+
         rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             udp_free_sock_data);
         if (rc != EOK) {
+                log_msg(LVL_DEBUG, "udp_sock_close - socket_destroy failed");
                 fibril_mutex_unlock(&socket->lock);
                 async_answer_0(callid, rc);
                 return;
         }
+
+        log_msg(LVL_DEBUG, "udp_sock_close - broadcast recv_buffer_cv");
+        fibril_condvar_broadcast(&socket->recv_buffer_cv);
 
         fibril_mutex_unlock(&socket->lock);
@@ -576 +587 @@
         log_msg(LVL_DEBUG, "udp_sock_recv_fibril()");
 
+        fibril_mutex_lock(&sock->recv_buffer_lock);
+
         while (true) {
                 log_msg(LVL_DEBUG, "[] wait for rcv buffer empty()");
-                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);
@@ -589 +601 @@
                 sock->recv_error = urc;
 
-                udp_sock_notify_data(sock->sock_core);
+                log_msg(LVL_DEBUG, "[] udp_uc_receive -> %d", urc);
+
+                if (sock->sock_core != NULL)
+                        udp_sock_notify_data(sock->sock_core);
 
                 if (urc != UDP_EOK) {
+                        log_msg(LVL_DEBUG, "[] urc != UDP_EOK, break");
                         fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                        fibril_mutex_unlock(&sock->recv_buffer_lock);
                         break;
                 }
@@ -600 +615 @@
 
                 sock->recv_buffer_used = rcvd;
-                fibril_mutex_unlock(&sock->recv_buffer_lock);
                 fibril_condvar_broadcast(&sock->recv_buffer_cv);
         }
 
+        log_msg(LVL_DEBUG, "udp_sock_recv_fibril() exited loop");
+        fibril_mutex_unlock(&sock->recv_buffer_lock);
         udp_uc_destroy(sock->assoc);
+
+        log_msg(LVL_DEBUG, "udp_sock_recv_fibril() terminated");
 
         return 0;