Changeset 7d31f7c in mainline for uspace/srv/net/socket/socket_client.c
- Timestamp:
- 2010-03-02T23:00:06Z (14 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/socket/socket_client.c
r91001e2 r7d31f7c 560 560 fibril_rwlock_write_unlock( & socket_globals.lock ); 561 561 fibril_condvar_wait( & socket->accept_signal, & socket->accept_lock ); 562 // drop the accept lock to avoid deadlock 563 fibril_mutex_unlock( & socket->accept_lock ); 562 564 fibril_rwlock_write_lock( & socket_globals.lock ); 565 fibril_mutex_lock( & socket->accept_lock ); 563 566 } 564 567 -- socket->blocked; … … 759 762 fibril_rwlock_read_unlock( & socket_globals.lock ); 760 763 fibril_condvar_wait( & socket->receive_signal, & socket->receive_lock ); 764 // drop the receive lock to avoid deadlock 765 fibril_mutex_unlock( & socket->receive_lock ); 761 766 fibril_rwlock_read_lock( & socket_globals.lock ); 767 fibril_mutex_lock( & socket->receive_lock ); 762 768 } 763 769 -- socket->blocked;
Note:
See TracChangeset
for help on using the changeset viewer.