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 8/9] n_tty: Eliminate counter in __process_echoes
Date
Since neither echo_commit nor echo_tail can change for the duration
of __process_echoes loop, substitute index comparison for the
snapshot counter.

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

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 4a2da9e..e689026 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -655,8 +655,7 @@ static size_t __process_echoes(struct tty_struct *tty)
old_space = space = tty_write_room(tty);

tail = ldata->echo_tail;
- nr = ldata->echo_commit - ldata->echo_tail;
- while (nr > 0) {
+ while (ldata->echo_commit != tail) {
c = echo_buf(ldata, tail);
if (c == ECHO_OP_START) {
unsigned char op;
@@ -700,20 +699,17 @@ static size_t __process_echoes(struct tty_struct *tty)
ldata->column--;
}
tail += 3;
- nr -= 3;
break;

case ECHO_OP_SET_CANON_COL:
ldata->canon_column = ldata->column;
tail += 2;
- nr -= 2;
break;

case ECHO_OP_MOVE_BACK_COL:
if (ldata->column > 0)
ldata->column--;
tail += 2;
- nr -= 2;
break;

case ECHO_OP_START:
@@ -726,7 +722,6 @@ static size_t __process_echoes(struct tty_struct *tty)
ldata->column++;
space--;
tail += 2;
- nr -= 2;
break;

default:
@@ -748,7 +743,6 @@ static size_t __process_echoes(struct tty_struct *tty)
ldata->column += 2;
space -= 2;
tail += 2;
- nr -= 2;
}

if (no_space_left)
@@ -766,7 +760,6 @@ static size_t __process_echoes(struct tty_struct *tty)
space -= 1;
}
tail += 1;
- nr -= 1;
}
}

--
1.8.1.2


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