Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 23:07:58 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Enable buffered reading

Browse source 
Read block of bytes from input and process byte by byte for output. This
will speed things up by reducing I/O overhead.
This commit is contained in:
Martin Lund 2022-06-24 01:24:13 +02:00
parent 4e08c68533
commit d522527c49
1 changed files with 50 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/tty.c
View file

@ -754,6 +754,7 @@ int tty_connect(void)
fd_set rdfs; /* Read file descriptor set */ fd_set rdfs; /* Read file descriptor set */
int maxfd; /* Maximum file descriptor used */ int maxfd; /* Maximum file descriptor used */
char input_char, output_char; char input_char, output_char;
char input_buffer[BUFSIZ];
static char previous_char = 0; static char previous_char = 0;
static bool first = true; static bool first = true;
int status; int status;
@ -877,10 +878,21 @@ int tty_connect(void)
if (FD_ISSET(fd, &rdfs)) if (FD_ISSET(fd, &rdfs))
{ {
/* Input from tty device ready */ /* Input from tty device ready */
if (read(fd, &input_char, 1) > 0) ssize_t bytes_read = read(fd, input_buffer, BUFSIZ);
if (bytes_read <= 0)
{ {
/* Update receive statistics */ /* Error reading - device is likely unplugged */
rx_total++; error_printf_silent("Could not read from tty device");
goto error_read;
}
/* Update receive statistics */
rx_total += bytes_read;
/* Process input byte by byte */
for (int i=0; i<bytes_read; i++)
{
input_char = input_buffer[i];
/* Print timestamp on new line if enabled */ /* Print timestamp on new line if enabled */
if (next_timestamp && input_char != '\n' && input_char != '\r') if (next_timestamp && input_char != '\n' && input_char != '\r')
@ -903,7 +915,9 @@ int tty_connect(void)
print('\r'); print('\r');
print('\n'); print('\n');
if (option.timestamp) if (option.timestamp)
{
next_timestamp = true; next_timestamp = true;
}
} }
else else
{ {
@ -926,55 +940,54 @@ int tty_connect(void)
next_timestamp = true; next_timestamp = true;
} }
} }
else
{
/* Error reading - device is likely unplugged */
error_printf_silent("Could not read from tty device");
goto error_read;
}
} }
else if (FD_ISSET(STDIN_FILENO, &rdfs)) else if (FD_ISSET(STDIN_FILENO, &rdfs))
{ {
/* Input from stdin ready */ /* Input from stdin ready */
status = read(STDIN_FILENO, &input_char, 1); ssize_t bytes_read = read(STDIN_FILENO, input_buffer, BUFSIZ);
if (status <= 0) if (bytes_read <= 0)
{ {
error_printf_silent("Could not read from stdin"); error_printf_silent("Could not read from stdin");
goto error_read; goto error_read;
} }
/* Forward input to output */ /* Process input byte by byte */
output_char = input_char; for (int i=0; i<bytes_read; i++)
forward = true;
output_char = input_char;
if (interactive_mode)
{ {
/* Do not forward ctrl-t key */ input_char = input_buffer[i];
if (input_char == KEY_CTRL_T)
/* Forward input to output */
output_char = input_char;
forward = true;
if (interactive_mode)
{ {
forward = false; /* Do not forward ctrl-t key */
} if (input_char == KEY_CTRL_T)
/* Handle commands */
handle_command_sequence(input_char, previous_char, &output_char, &forward);
/* Save previous key */
previous_char = input_char;
if (print_mode == HEX)
{
if (!is_valid_hex(input_char))
{ {
warning_printf("Invalid hex character: '%d' (0x%02x)", input_char, input_char);
forward = false; forward = false;
} }
}
}
if (forward) /* Handle commands */
{ handle_command_sequence(input_char, previous_char, &output_char, &forward);
forward_to_tty(fd, output_char);
/* Save previous key */
previous_char = input_char;
if (print_mode == HEX)
{
if (!is_valid_hex(input_char))
{
warning_printf("Invalid hex character: '%d' (0x%02x)", input_char, input_char);
forward = false;
}
}
}
if (forward)
{
forward_to_tty(fd, output_char);
}
} }
} }
else else