lkml.org 
[lkml]   [2013]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 07/20] n_tty: Factor signal char handling into separate fn
    Date
    Reduce the monolithic n_tty_receive_char() complexity; factor the
    handling of INTR_CHAR, QUIT_CHAR and SUSP_CHAR into
    n_tty_receive_signal_char().

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

    diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
    index 309d964..be5ef56 100644
    --- a/drivers/tty/n_tty.c
    +++ b/drivers/tty/n_tty.c
    @@ -1218,6 +1218,26 @@ static inline void n_tty_receive_parity_error(struct tty_struct *tty,
    wake_up_interruptible(&tty->read_wait);
    }

    +static void
    +n_tty_receive_signal_char(struct tty_struct *tty, int signal, unsigned char c)
    +{
    + if (!L_NOFLSH(tty)) {
    + /* flushing needs exclusive termios_rwsem */
    + up_read(&tty->termios_rwsem);
    + n_tty_flush_buffer(tty);
    + tty_driver_flush_buffer(tty);
    + down_read(&tty->termios_rwsem);
    + }
    + if (I_IXON(tty))
    + start_tty(tty);
    + if (L_ECHO(tty)) {
    + echo_char(c, tty);
    + commit_echoes(tty);
    + }
    + isig(signal, tty);
    + return;
    +}
    +
    /**
    * n_tty_receive_char - perform processing
    * @tty: terminal device
    @@ -1313,30 +1333,14 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
    }

    if (L_ISIG(tty)) {
    - int signal;
    - signal = SIGINT;
    - if (c == INTR_CHAR(tty))
    - goto send_signal;
    - signal = SIGQUIT;
    - if (c == QUIT_CHAR(tty))
    - goto send_signal;
    - signal = SIGTSTP;
    - if (c == SUSP_CHAR(tty)) {
    -send_signal:
    - if (!L_NOFLSH(tty)) {
    - /* flushing needs exclusive termios_rwsem */
    - up_read(&tty->termios_rwsem);
    - n_tty_flush_buffer(tty);
    - tty_driver_flush_buffer(tty);
    - down_read(&tty->termios_rwsem);
    - }
    - if (I_IXON(tty))
    - start_tty(tty);
    - if (L_ECHO(tty)) {
    - echo_char(c, tty);
    - commit_echoes(tty);
    - }
    - isig(signal, tty);
    + if (c == INTR_CHAR(tty)) {
    + n_tty_receive_signal_char(tty, SIGINT, c);
    + return;
    + } else if (c == QUIT_CHAR(tty)) {
    + n_tty_receive_signal_char(tty, SIGQUIT, c);
    + return;
    + } else if (c == SUSP_CHAR(tty)) {
    + n_tty_receive_signal_char(tty, SIGTSTP, c);
    return;
    }
    }
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-06-15 16:41    [W:4.052 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site