Changeset 4e716180 in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2013-05-03T21:14:39Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

716357f

Parents:

1c7ba2d (diff), 5d1cb8a (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 simple DNS resolver.

File:

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

uspace/srv/net/udp/sock.c

@@ -537 +537 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()");
         int socket_id = SOCKET_GET_SOCKET_ID(call);
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - find core");
         socket_core_t *sock_core =
             socket_cores_find(&client->sockets, socket_id);
         if (sock_core == NULL) {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - core not found");
                 async_answer_0(callid, ENOTSOCK);
                 return;
         }
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - spec data");
         udp_sockdata_t *socket =
             (udp_sockdata_t *) sock_core->specific_data;
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - lock socket");
         fibril_mutex_lock(&socket->lock);
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - lock socket buffer");
+        fibril_mutex_lock(&socket->recv_buffer_lock);
+        log_msg(LOG_DEFAULT, 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);
+
         int rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             udp_free_sock_data);
         if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_close - socket_destroy failed");
                 fibril_mutex_unlock(&socket->lock);
                 async_answer_0(callid, rc);
                 return;
         }
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_close - broadcast recv_buffer_cv");
+        fibril_condvar_broadcast(&socket->recv_buffer_cv);
+
         fibril_mutex_unlock(&socket->lock);
         async_answer_0(callid, EOK);
@@ -582 +598 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril()");
 
+        fibril_mutex_lock(&sock->recv_buffer_lock);
+
         while (true) {
                 log_msg(LOG_DEFAULT, 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);
                 }
-                
+
+                fibril_mutex_unlock(&sock->recv_buffer_lock);
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] call udp_uc_receive()");
                 urc = udp_uc_receive(sock->assoc, sock->recv_buffer,
                     UDP_FRAGMENT_SIZE, &rcvd, &xflags, &sock->recv_fsock);
+                fibril_mutex_lock(&sock->recv_buffer_lock);
                 sock->recv_error = urc;
-                
-                udp_sock_notify_data(sock->sock_core);
-                
+
+                log_msg(LOG_DEFAULT, 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(LOG_DEFAULT, LVL_DEBUG, "[] urc != UDP_EOK, break");
                         fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                        fibril_mutex_unlock(&sock->recv_buffer_lock);
-                        break;
-                }
-                
+                        break;
+                }
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] got data - broadcast recv_buffer_cv");
-                
+
                 sock->recv_buffer_used = rcvd;
-                fibril_mutex_unlock(&sock->recv_buffer_lock);
                 fibril_condvar_broadcast(&sock->recv_buffer_cv);
         }
 
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril() exited loop");
+        fibril_mutex_unlock(&sock->recv_buffer_lock);
         udp_uc_destroy(sock->assoc);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril() terminated");
 
         return 0;