Changeset ccb5165 in mainline

Timestamp:

2013-04-20T07:28:39Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0041cd6d

Parents:

6d717a4

Message:

Do not hold recv_buffer_lock while calling udp_uc_receive().

Location:

uspace/srv/net

Files:

• dnsres/transport.c (modified) (3 diffs)
• udp/sock.c (modified) (4 diffs)

uspace/srv/net/dnsres/transport.c

@@ -45 +45 @@
 
 #include <stdio.h>
+
+#define RECV_BUF_SIZE 4096
+
+static uint8_t recv_buf[RECV_BUF_SIZE];
+
 int dns_request(dns_message_t *req, dns_message_t **rresp)
 {
@@ -53 +58 @@
         struct sockaddr_in addr;
         struct sockaddr_in laddr;
+        struct sockaddr_in src_addr;
+        socklen_t src_addr_size;
         int fd;
 
@@ -86 +93 @@
                 goto error;
 
+        src_addr_size = sizeof(src_addr);
+        rc = recvfrom(fd, recv_buf, RECV_BUF_SIZE, 0,
+            (struct sockaddr *)&src_addr, &src_addr_size);
+        if (rc < 0) {
+                printf("recvfrom returns error - %d\n", rc);
+                goto error;
+        }
+
+        printf("received %d bytes\n", (int)rc);
+
+        printf("close socket\n");
         closesocket(fd);
+        printf("free req_data\n");
         free(req_data);
 

uspace/srv/net/udp/sock.c

@@ -538 +538 @@
         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");
@@ -601 +606 @@
                             &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;
 
@@ -611 +619 @@
                 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");
@@ -617 +625 @@
                         break;
                 }
-                
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] got data - broadcast recv_buffer_cv");
-                
+
                 sock->recv_buffer_used = rcvd;
                 fibril_condvar_broadcast(&sock->recv_buffer_cv);