summaryrefslogtreecommitdiff
path: root/term/ptyio.c
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2012-09-03 15:47:25 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-11-24 18:46:46 +0100
commit7648503cd894549874ff13f7ed94a4708cf50f0d (patch)
treed31187eabbacf81debf2bc4473b014c116ecbf34 /term/ptyio.c
parentb2d57eb33ddd8f24929f372bfb08bac3a29ac6ea (diff)
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.
Diffstat (limited to 'term/ptyio.c')
-rw-r--r--term/ptyio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/term/ptyio.c b/term/ptyio.c
index 9c1509ff..b02cda3f 100644
--- a/term/ptyio.c
+++ b/term/ptyio.c
@@ -58,8 +58,7 @@ static int nptyperopens = 0;
static error_t
ptyio_init (void)
{
- condition_implies (inputq->wait, &pty_select_wakeup);
- condition_implies (&pty_read_wakeup, &pty_select_wakeup);
+ pty_select_alert = &pty_select_wakeup;
return 0;
}
@@ -132,6 +131,7 @@ wake_reader ()
{
pty_read_blocked = 0;
condition_broadcast (&pty_read_wakeup);
+ condition_broadcast (&pty_select_wakeup);
}
}