Date: Sun, 19 Feb 2023 03:10:45 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ef6f20ce4761 - main - tail: Retry kevent if the system call was interrupted Message-ID: <202302190310.31J3Aj1O080933@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef6f20ce47613db7cc615b45f4b6fa1eb99ae0ba commit ef6f20ce47613db7cc615b45f4b6fa1eb99ae0ba Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2023-02-19 03:04:29 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-02-19 03:09:26 +0000 tail: Retry kevent if the system call was interrupted 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 --- usr.bin/tail/forward.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index 3897d115effd..6dbeb9cdd047 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302190310.31J3Aj1O080933>