From 7648503cd894549874ff13f7ed94a4708cf50f0d Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Mon, 3 Sep 2012 15:47:25 +0200 Subject: Remove condition implications There is no equivalent for these functions in libpthread. Instead of adding them as non standard extensions, rework their use. * console-client/kbd-repeat.c (kbd_repeat_key): Wake threads waiting on select_alert. (kbd_setrepeater): Remove call to condition_implies. console-client/pc-mouse.c (repeat_event): Wake threads waiting on select_alert. (setrepeater): Remove call to condition_implies. * libpipe/pipe.c (pipe_create): Initialize the `pending_selects' member. (pipe_add_select_cond): New function. (pipe_remove_select_cond): Likewise. (pipe_select_cond_broadcast): Likewise. (_pipe_no_readers): Wake threads waiting on a pending select. (_pipe_no_writers): Likewise. (pipe_send): Likewise. (pipe_recv): Likewise. (pipe_pair_select): Replace condition implications by installing a pending select on the pair of pipes. * libpipe/pipe.h (struct pipe_select_cond): New type. (struct pipe): New member `pending_selects'. * pfinet/tunnel.c (tunnel_xmit): Wake threads waiting on tdev->select_alert. (setup_tunnel_device): Remove call to condition_implies. * term/devio.c (device_write_reply_inband): Wake threads waiting on select_alert. * term/hurdio.c (hurdio_writer_loop): Likewise. * term/main.c (main): Remove calls to condition_implies. * term/ptyio.c (ptyio_init): Remove calls to condition_implies, initialize pty_select_alert. (wake_reader): Wake threads waiting on pty_select_wakeup. * term/term.h (pty_select_alert): New variable. (clear_queue): Wake threads waiting on select_alert and, if acting on the input queue, pty_select_alert, unless it's NULL. (dequeue_quote): Likewise. (enqueue_internal): Likewise. (queue_erase): Likewise. * trans/streamio.c (clear_buffer): Wake threads waiting on select_alert. (buffer_read): Likewise. (buffer_write): Likewise. (device_read_reply_inband): Likewise. (device_write_reply_inband): Likewise. (main): Remove calls to condition_implies. --- libpipe/pipe.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libpipe/pipe.h') diff --git a/libpipe/pipe.h b/libpipe/pipe.h index 96432990..a3590fc4 100644 --- a/libpipe/pipe.h +++ b/libpipe/pipe.h @@ -62,6 +62,13 @@ extern struct pipe_class *stream_pipe_class; extern struct pipe_class *dgram_pipe_class; extern struct pipe_class *seqpack_pipe_class; +struct pipe_select_cond +{ + struct pipe_select_cond *next; + struct pipe_select_cond *prev; + struct condition cond; +}; + /* A unidirectional data pipe; it transfers data from READER to WRITER. */ struct pipe { @@ -88,6 +95,8 @@ struct pipe struct condition pending_writes; struct condition pending_write_selects; + struct pipe_select_cond *pending_selects; + /* The maximum number of characters that this pipe will hold without further writes blocking. */ size_t write_limit; -- cgit v1.2.3