diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-12 01:25:53 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-12 01:25:53 +0000 |
| commit | 5a8f3cd8adaabc814a916e225ff4af9c0689ac92 (patch) | |
| tree | fd143874aff6f0291c08b1b2fd3dd87c49ec36c9 /libchannel/broadcast.c | |
| parent | becf233178d2cf402591e97d7a8499cafbbb7251 (diff) | |
Fix build against libpthreadlibchannel
* channelio/Makefile (HURDLIBS): Remove threads.
(OTHERLIBS): Add -lpthread.
* channelio/open.h: Use pthread functions instead of cthreads functions.
* libchannel/broadcast.c: Likewise.
* libchannel/channel.h: Likewise.
* libchannel/hub.c: Likewise.
Diffstat (limited to 'libchannel/broadcast.c')
| -rw-r--r-- | libchannel/broadcast.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libchannel/broadcast.c b/libchannel/broadcast.c index f25ae27fb..187457c25 100644 --- a/libchannel/broadcast.c +++ b/libchannel/broadcast.c @@ -51,7 +51,7 @@ broadcast_read (struct channel *channel, size_t amount, struct channel_hub *hub = channel->hub; struct broadcast_hook *hook = hub->hook; - mutex_lock (&hub->lock); + pthread_mutex_lock (&hub->lock); hook->wait_count++; if (hook->amount == 0 || amount < hook->amount) @@ -79,7 +79,7 @@ broadcast_read (struct channel *channel, size_t amount, memcpy (*buf, hook->buf, hook->amount); *len = hook->len; - mutex_unlock (&hub->lock); + pthread_mutex_unlock (&hub->lock); return 0; } @@ -114,13 +114,13 @@ broadcast_close (struct channel *channel) { struct broadcast_hook *hook = channel->hub->hook; - mutex_lock (&channel->hub->lock); + pthread_mutex_lock (&channel->hub->lock); hook->num_channels--; if (hook->num_channels == 0) channel_close (hook->channel); - mutex_unlock (&channel->hub->lock); + pthread_mutex_unlock (&channel->hub->lock); } |