Changes in uspace/srv/net/socket/socket_client.c [7fb2ce3:8ab2074] in mainline

File:

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

uspace/srv/net/socket/socket_client.c

@@ -560 +560 @@
                 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;
@@ -759 +762 @@
                 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;