Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix high CPU usage in subsequent select(2) calls

Browse source 
The timeout was being reset to zero, so `select` was being called in a
very tight loop.

Closes #5761.
This commit is contained in:
Mahmoud Al-Qudsi 2019-04-09 21:09:27 -05:00
parent 49935f13df
commit ab1519acef
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/io.cpp
View file

@ -76,6 +76,9 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(fd, &fds); FD_SET(fd, &fds);
int ret = select(fd + 1, &fds, NULL, NULL, &tv); int ret = select(fd + 1, &fds, NULL, NULL, &tv);
// select(2) is allowed to (and does) update `tv` to indicate how much time was left, so we
// need to restore the desired value each time.
tv.tv_usec = poll_timeout_usec;
readable = ret > 0; readable = ret > 0;
if (ret < 0 && errno != EINTR) { if (ret < 0 && errno != EINTR) {
// Surprising error. // Surprising error.