RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

terminal-unix: fix busy looping on Linux 

POSIX permits select() to modify the timeout, which can happen on the
Linux implementation. This can reset the timeout, which spins this into
a tight loop. A timeout isn't necessary in the first place, so just use
NULL instead.
This commit is contained in:
Drew DeVault 2017-12-08 11:10:59 -05:00 committed by Jan Ekström
parent 3c62a20f48
commit 0f9a690eba
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osdep/terminal-unix.c
View File

@ -389,13 +389,12 @@ static void *terminal_thread(void *ptr)
bool stdin_ok = read_terminal; // if false, we still wait for SIGTERM
fd_set readfds;
int max = death_pipe[0] > tty_in ? death_pipe[0] : tty_in;
struct timeval timeout = { .tv_sec = 0, .tv_usec = 100000 };
while (1) {
FD_ZERO(&readfds);
FD_SET(death_pipe[0], &readfds);
FD_SET(tty_in, &readfds);
getch2_poll();
int s = select(max + 1, &readfds, NULL, NULL, &timeout);
int s = select(max + 1, &readfds, NULL, NULL, NULL);
if (s == -1) {
break;
} else if (s != 0) {