Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some edge-case tty lockups

Browse Source
This commit is contained in:
Kevin Lange 2017-02-01 22:29:33 +09:00
parent 08b5bbe36d
commit 22279b02f0
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/ds/ringbuffer.c
View File

@ -108,6 +108,9 @@ size_t ring_buffer_write(ring_buffer_t * ring_buffer, size_t size, uint8_t * buf
wakeup_queue(ring_buffer->wait_queue_readers);
ring_buffer_alert_waiters(ring_buffer);
if (written < size) {
if (ring_buffer->discard) {
break;
}
if (sleep_on(ring_buffer->wait_queue_writers) && ring_buffer->internal_stop) {
ring_buffer->internal_stop = 0;
break;
@ -132,6 +135,7 @@ ring_buffer_t * ring_buffer_create(size_t size) {
spin_init(out->lock);
out->internal_stop = 0;
out->discard = 0;
out->wait_queue_readers = list_create();
out->wait_queue_writers = list_create();

32
kernel/fs/tty.c
View File

@ -13,7 +13,8 @@
#include <termios.h>
#include <ringbuffer.h>
#define TTY_BUFFER_SIZE 512
#define TTY_BUFFER_SIZE 4096
//4096
typedef struct pty {
/* the PTY number */
@ -62,6 +63,15 @@ static void clear_input_buffer(pty_t * pty) {
}
static void output_process(pty_t * pty, uint8_t c) {
if (ring_buffer_available(pty->out) < 2) return; /* uh oh */
if (c == '\n' && (pty->tios.c_oflag & ONLCR)) {
uint8_t d = '\r';
OUT(d);
}
OUT(c);
}
static void output_process_slave(pty_t * pty, uint8_t c) {
if (c == '\n' && (pty->tios.c_oflag & ONLCR)) {
uint8_t d = '\r';
OUT(d);
@ -128,20 +138,18 @@ static void input_process(pty_t * pty, uint8_t c) {
}
return;
}
pty->canon_buffer[pty->canon_buflen] = c;
if (pty->canon_buflen < pty->canon_bufsize) {
pty->canon_buffer[pty->canon_buflen] = c;
pty->canon_buflen++;
}
if (pty->tios.c_lflag & ECHO) {
output_process(pty, c);
}
if (pty->canon_buffer[pty->canon_buflen] == '\n') {
pty->canon_buflen++;
if (c == '\n') {
pty->canon_buffer[pty->canon_buflen-1] = c;
dump_input_buffer(pty);
return;
}
if (pty->canon_buflen == pty->canon_bufsize) {
dump_input_buffer(pty);
return;
}
pty->canon_buflen++;
return;
} else if (pty->tios.c_lflag & ECHO) {
output_process(pty, c);
@ -244,7 +252,7 @@ uint32_t write_pty_slave(fs_node_t * node, uint32_t offset, uint32_t size, uint8
size_t l = 0;
for (uint8_t * c = buffer; l < size; ++c, ++l) {
output_process(pty, *c);
output_process_slave(pty, *c);
}
return l;
@ -371,6 +379,8 @@ pty_t * pty_new(struct winsize * size) {
pty->in = ring_buffer_create(TTY_BUFFER_SIZE);
pty->out = ring_buffer_create(TTY_BUFFER_SIZE);
pty->in->discard = 1;
/* Master endpoint - writes go to stdin, reads come from stdout */
pty->master = pty_master_create(pty);
@ -409,7 +419,7 @@ pty_t * pty_new(struct winsize * size) {
pty->tios.c_cc[VTIME] = 0;
pty->canon_buffer = malloc(TTY_BUFFER_SIZE);
pty->canon_bufsize = TTY_BUFFER_SIZE;
pty->canon_bufsize = TTY_BUFFER_SIZE-2;
pty->canon_buflen = 0;
return pty;

1
kernel/include/ringbuffer.h
View File

@ -11,6 +11,7 @@ typedef struct {
list_t * wait_queue_writers;
int internal_stop;
list_t * alert_waiters;
int discard;
} ring_buffer_t;
size_t ring_buffer_unread(ring_buffer_t * ring_buffer);