lkml.org 
[lkml]   [2013]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 tty-next 5/8] n_tty: Refactor input_available_p() by call site
    Date
    Distinguish if caller is n_tty_poll() or n_tty_read(), and
    set the read/wakeup threshold accordingly.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/n_tty.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
    index 008b6e5..aae171e 100644
    --- a/drivers/tty/n_tty.c
    +++ b/drivers/tty/n_tty.c
    @@ -1881,14 +1881,15 @@ static int n_tty_open(struct tty_struct *tty)
    return 0;
    }

    -static inline int input_available_p(struct tty_struct *tty, int amt)
    +static inline int input_available_p(struct tty_struct *tty, int poll)
    {
    struct n_tty_data *ldata = tty->disc_data;
    + int amt = poll && !TIME_CHAR(tty) ? MIN_CHAR(tty) : 1;

    if (ldata->icanon && !L_EXTPROC(tty)) {
    if (ldata->canon_head != ldata->read_tail)
    return 1;
    - } else if (read_cnt(ldata) >= (amt ? amt : 1))
    + } else if (read_cnt(ldata) >= amt)
    return 1;

    return 0;
    @@ -2393,7 +2394,7 @@ static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,

    poll_wait(file, &tty->read_wait, wait);
    poll_wait(file, &tty->write_wait, wait);
    - if (input_available_p(tty, TIME_CHAR(tty) ? 0 : MIN_CHAR(tty)))
    + if (input_available_p(tty, 1))
    mask |= POLLIN | POLLRDNORM;
    if (tty->packet && tty->link->ctrl_status)
    mask |= POLLPRI | POLLIN | POLLRDNORM;
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-12-02 21:01    [W:8.124 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site