Changes in uspace/srv/net/socket/socket_client.c [aadf01e:5814ef7] in mainline

File:

• uspace/srv/net/socket/socket_client.c (modified) (4 diffs)

uspace/srv/net/socket/socket_client.c

@@ -421 +421 @@
         int socket_id;
         services_t service;
+        ipcarg_t fragment_size;
+        ipcarg_t header_size;
 
         // find the appropriate service
@@ -478 +480 @@
                 return socket_id;
         }
-        if(ERROR_OCCURRED((int) async_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL, (ipcarg_t *) &socket->data_fragment_size, (ipcarg_t *) &socket->header_size))){
+        if(ERROR_OCCURRED((int) async_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL, &fragment_size, &header_size))){
                 fibril_rwlock_write_unlock(&socket_globals.lock);
                 free(socket);
                 return ERROR_CODE;
         }
+        socket->data_fragment_size = (size_t) fragment_size;
+        socket->header_size = (size_t) header_size;
         // finish the new socket initialization
         socket_initialize(socket, socket_id, phone, service);
@@ -580 +584 @@
                 fibril_rwlock_write_unlock(&socket_globals.lock);
                 fibril_condvar_wait(&socket->accept_signal, &socket->accept_lock);
+                // drop the accept lock to avoid deadlock
+                fibril_mutex_unlock(&socket->accept_lock);
                 fibril_rwlock_write_lock(&socket_globals.lock);
+                fibril_mutex_lock(&socket->accept_lock);
         }
         -- socket->blocked;
@@ -801 +808 @@
                 fibril_rwlock_read_unlock(&socket_globals.lock);
                 fibril_condvar_wait(&socket->receive_signal, &socket->receive_lock);
+                // drop the receive lock to avoid deadlock
+                fibril_mutex_unlock(&socket->receive_lock);
                 fibril_rwlock_read_lock(&socket_globals.lock);
+                fibril_mutex_lock(&socket->receive_lock);
         }
         -- socket->blocked;