d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tail: Retry kevent if the system call was interrupted

Browse Source 
kevent returns EINTR when I suspend / resume. This causes tail -f
and tail -F to exit with interrupt system call. Ignore this error
and try kevent again.

Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2023-02-18 20:04:29 -07:00
parent e600bcfb87
commit ef6f20ce47
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/tail/forward.c
View File

@ -411,10 +411,16 @@ follow(file_info_t *files, enum STYLE style, off_t off)
/*
* In the -F case we set a timeout to ensure that
* we re-stat the file at least once every second.
* If we've recieved EINTR, ignore it. Both reasons
* for its generation are transient.
*/
n = kevent(kq, NULL, 0, ev, 1, Fflag ? &ts : NULL);
if (n < 0)
err(1, "kevent");
do {
n = kevent(kq, NULL, 0, ev, 1, Fflag ? &ts : NULL);
if (n < 0 && errno == EINTR)
continue;
if (n < 0)
err(1, "kevent");
} while (n < 0);
if (n == 0) {
/* timeout */
break;