diff options
author | Richard Braun <rbraun@sceen.net> | 2012-09-03 15:47:25 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-24 18:46:46 +0100 |
commit | 7648503cd894549874ff13f7ed94a4708cf50f0d (patch) | |
tree | d31187eabbacf81debf2bc4473b014c116ecbf34 /term/term.h | |
parent | b2d57eb33ddd8f24929f372bfb08bac3a29ac6ea (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/term.h')
-rw-r--r-- | term/term.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/term/term.h b/term/term.h index 81d0efee..2df20337 100644 --- a/term/term.h +++ b/term/term.h @@ -103,6 +103,9 @@ struct condition carrier_alert; /* Wakeup for select */ struct condition select_alert; +/* Wakeup for pty select, if not null */ +struct condition *pty_select_alert; + /* Bucket for all our ports. */ struct port_bucket *term_bucket; @@ -225,6 +228,9 @@ clear_queue (struct queue *q) q->susp = 0; q->cs = q->ce = q->array; condition_broadcast (q->wait); + condition_broadcast (&select_alert); + if (q == inputq && pty_select_alert != NULL) + condition_broadcast (pty_select_alert); } #endif /* Use extern inlines. */ @@ -249,7 +255,10 @@ dequeue_quote (struct queue *q) if (beep) { condition_broadcast (q->wait); - if (q == outputq) + condition_broadcast (&select_alert); + if (q == inputq && pty_select_alert != NULL) + condition_broadcast (pty_select_alert); + else if (q == outputq) call_asyncs (O_WRITE); } return *q->cs++; @@ -280,8 +289,13 @@ enqueue_internal (struct queue **qp, quoted_char c) if (qsize (q) == 1) { condition_broadcast (q->wait); + condition_broadcast (&select_alert); if (q == inputq) - call_asyncs (O_READ); + { + if (pty_select_alert != NULL) + condition_broadcast (pty_select_alert); + call_asyncs (O_READ); + } } if (!q->susp && (qsize (q) > q->hiwat)) @@ -334,7 +348,12 @@ queue_erase (struct queue *q) if (qsize (q) == 0) beep = 1; if (beep) - condition_broadcast (q->wait); + { + condition_broadcast (q->wait); + condition_broadcast (&select_alert); + if (q == inputq && pty_select_alert != NULL) + condition_broadcast (pty_select_alert); + } return answer; } #endif /* Use extern inlines. */ |