From nobody Sun Feb 19 03:10:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PK9Y2691qz3sKl3; Sun, 19 Feb 2023 03:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PK9Y2406Pz4J7T; Sun, 19 Feb 2023 03:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676776246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q+PnzvZjNip6xqoIMft19wrAtWRPH/TUr3T70AvtJpg=; b=MWO8fOWLTs7hUNPO4fsGwN0JxapXBiSYvo5GQH/N+jtabF7TVrAbAsw/v8Qc4ygbpjPOyn iokuZ5U5LHThYRFXxkcWeCLhBG2lPzn1czEDgv3WFSM0jHx5MJ+/U0Dgk/x7l4lYjQgSXb wR05MycT870KAn4Le74xayJHVaH5nL5yLVMkDkRYin3MJtLi7R47meSkxqCIUw3gVq3Y8E oJWbmQLguFrtAeBa5pSx5BIlY5Zo8E0c8pa6x82MEK9p3wyIXWEay+LjSS5x87sN+03o33 DUyqrGxDWe6jQhJLOOn2gQpWyGZi19Q9NMzylX6ahtf8BEQYzUrU2qRAo13CKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676776246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q+PnzvZjNip6xqoIMft19wrAtWRPH/TUr3T70AvtJpg=; b=m1rOCXHfD/oVU8x5g1JYu1/duBQP0WRjtGX89iKHI+rw8XP3zrXTBdjKr+NmBuIJdciI9E V7Mnl9wCjNB89pijWF4hCv8MTf9qN7AkWjp67M6yovwqcT2+PWybbDCyWRCTtAzlinIYeh Svbki6wijqod/LWzMunLqgUQTaDVUlwzkUkRuFVwE+cXvukA5cyd5g/WAjn2COxq/Sx38g 9joxdLASpr3J47QY8ClNr21xTl7ZHdEmzfLw8AJN6dJ22MIh9/TcGVtXTV2hDrQ1YzxONs LWk0zP0X8HcmwLjgyujEgbya9LcPwwim2++QgnAmr2HfMGhnYo5GFQojG12W4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676776246; a=rsa-sha256; cv=none; b=te+SR8bWHzVDxUEhvuL+lyc9T0BnvjjYXw+4wnPgC8S1oPMwqHnLbZxQkgy5FwfVRrWRtb hFAMsilqMLVeZ49EYsoanDjV8Wm5b7upn4gab1RuG3/reNPIFFlhCdhs2Fu0aCZu+cJCbk CtzHqUf0GZY61vbeIC2cQWrIG4vNYD9tfzC+qWaw4lj0u7W2A3/+WADrIGqdFrUJGhbE92 a2T0ZPwj+tGapU6IJH1qOGfNHgj0jBA6ZY98KSKWGsBpNxot9tk7bSt4lfxQxQidnYwIzP hMy1x9JmqeIDaninUODqkic9/fNxNogNHQPzcXzw9MRDWlcr9nGicv8+ozq8kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PK9Y10qLFzmqf; Sun, 19 Feb 2023 03:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31J3AjIT080934; Sun, 19 Feb 2023 03:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J3Aj1O080933; Sun, 19 Feb 2023 03:10:45 GMT (envelope-from git) Date: Sun, 19 Feb 2023 03:10:45 GMT Message-Id: <202302190310.31J3Aj1O080933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ef6f20ce4761 - main - tail: Retry kevent if the system call was interrupted List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef6f20ce47613db7cc615b45f4b6fa1eb99ae0ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef6f20ce47613db7cc615b45f4b6fa1eb99ae0ba commit ef6f20ce47613db7cc615b45f4b6fa1eb99ae0ba Author: Warner Losh AuthorDate: 2023-02-19 03:04:29 +0000 Commit: Warner Losh 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;