lkml.org 
[lkml]   [2007]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/8] Char: tty_ioctl, use wait_event_interruptible_timeout
    From
    Date
    tty_ioctl, use wait_event_interruptible_timeout

    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>

    ---
    commit f030662cbc20e758047c5ec07396862761ea8643
    tree 113645cd1e51b8469b77022f2c68fdb94ab54449
    parent 29f15033f00e36f622d0bcd5a2dd0f9a49981481
    author Jiri Slaby <jirislaby@gmail.com> Sat, 26 May 2007 20:56:41 +0200
    committer Jiri Slaby <jirislaby@gmail.com> Sat, 26 May 2007 20:56:41 +0200

    drivers/char/tty_ioctl.c | 21 +++------------------
    1 files changed, 3 insertions(+), 18 deletions(-)

    diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
    index 918e24c..2b6a384 100644
    --- a/drivers/char/tty_ioctl.c
    +++ b/drivers/char/tty_ioctl.c
    @@ -52,8 +52,6 @@

    void tty_wait_until_sent(struct tty_struct * tty, long timeout)
    {
    - DECLARE_WAITQUEUE(wait, current);
    -
    #ifdef TTY_DEBUG_WAIT_UNTIL_SENT
    char buf[64];

    @@ -61,26 +59,13 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout)
    #endif
    if (!tty->driver->chars_in_buffer)
    return;
    - add_wait_queue(&tty->write_wait, &wait);
    if (!timeout)
    timeout = MAX_SCHEDULE_TIMEOUT;
    - do {
    -#ifdef TTY_DEBUG_WAIT_UNTIL_SENT
    - printk(KERN_DEBUG "waiting %s...(%d)\n", tty_name(tty, buf),
    - tty->driver->chars_in_buffer(tty));
    -#endif
    - set_current_state(TASK_INTERRUPTIBLE);
    - if (signal_pending(current))
    - goto stop_waiting;
    - if (!tty->driver->chars_in_buffer(tty))
    - break;
    - timeout = schedule_timeout(timeout);
    - } while (timeout);
    + if (wait_event_interruptible_timeout(tty->write_wait,
    + !tty->driver->chars_in_buffer(tty), timeout))
    + return;
    if (tty->driver->wait_until_sent)
    tty->driver->wait_until_sent(tty, timeout);
    -stop_waiting:
    - set_current_state(TASK_RUNNING);
    - remove_wait_queue(&tty->write_wait, &wait);
    }

    EXPORT_SYMBOL(tty_wait_until_sent);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-05-28 15:31    [W:0.019 / U:90.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site