Changeset 7d31f7c in mainline for uspace/srv/net/socket/socket_client.c

Timestamp:

2010-03-02T23:00:06Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b5cbff4

Parents:

91001e2 (diff), 92307f1 (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 networking fixes.

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;