From nobody Thu Feb 09 20:40:44 2023 X-Original-To: dev-commits-src-branches@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 4PCTK83YrTz3ndg4; Thu, 9 Feb 2023 20:40:44 +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 4PCTK82fdjz3x8G; Thu, 9 Feb 2023 20:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675975244; 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=jsqh70A4DAR27DwM3yHL+aSK3pOHHiq5KtOAOZkPtMA=; b=gPmOkh1mg6AFCkfPZYDZT0zKGpAClrmBIZhLuvQGXHs9Ps11FaAhXOhCv++T/jnbyyt5fA jBZDguFxOlAPSbEy+rZcIt8MONZhKxjPrWzt1RnPuyH4x++s6dercxm3dxiTzIHsoA43La xXez3jmEbBpC9aKYxlxSJyEolUEL5ZAGcD11yu8gzMZwpc3Y/mFK90nuSPXLiTJjSHHTk/ 6LqYg1yO9KHDAxL6h4WGqkbQ+GAPrH7coc51S82471dHBKJ4XYqeZmGsQpxTyrIYyiSAbr UZf+8GSzqps/Xf8D/C+Mgw+N7B9cKZIvV6MwAbKHlW5v0IrM6KvyOQ32RWTkqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675975244; 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=jsqh70A4DAR27DwM3yHL+aSK3pOHHiq5KtOAOZkPtMA=; b=Qx4yx9Ey4LMW5JWY47FvCCOE/L99K6lpXfWErNCk0p4BNZv7V92/AYCAe11fka1lBJQ+cb 192xu5sg6RYJNpUIAjgWBtJsKLJN64K+TonCZ6rz1iRLHJidxJyeddt2duOJjVZFXpt8TJ qExwVMkYh1/sJhrVaL1bMG+uRJAlyWs7CHiiI9LJKT7Iq6MZcosSBnGXjKPipHd16ualoi 6IImiVdOQ6dTNZCyH7jvTTkgEpjnqd4DXgf6EsLdmTpUv2BpbYiUZ/c2FiLXa6GaJAvXru bDxj29Ehf7cnfdRTxzqBl4+vUYQ4OKDUX8FRK7xU2GNM92UGbCw3Jw4pBa9tGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675975244; a=rsa-sha256; cv=none; b=i6i3Rf5m9rcBRclAAqQ41Olp+Z9MpuFDE0CvHVEBJsnDV3ahPbd+GvPvBJjUOkvzii8WUC xv09wXA39F7/I0DMmjU3AV2aVcpXEaqwN+mrzZlJM+knmcrnVV2Ud3HmknnTUwnVi3EVDV VXBLswW9TwsLCHCpRSsQd+LbJge9cLvk2Fcc+jaLtJvZ0oQ1/ABVZlxo+i8ZZEGD1F4XPu PE1UN64RzDoZKfeHaWkH3JBZRz72kBIYewu3a6PvXL2xrgOMaChJTynOz5dmtw0eGV9bHO gMjxKFb7v6UOt69nyCEynccTdv7JKA2Gld2nqbrfZKiWeSu4dQFH44ATmcZ2dg== 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 4PCTK81dFTzr74; Thu, 9 Feb 2023 20:40:44 +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 319Keiv4093971; Thu, 9 Feb 2023 20:40:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319KeiaQ093970; Thu, 9 Feb 2023 20:40:44 GMT (envelope-from git) Date: Thu, 9 Feb 2023 20:40:44 GMT Message-Id: <202302092040.319KeiaQ093970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 54117b169fba - stable/13 - cmp: Print a summary on SIGINFO. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 54117b169fba3ed04e30b467d0d209ef398a9c26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=54117b169fba3ed04e30b467d0d209ef398a9c26 commit 54117b169fba3ed04e30b467d0d209ef398a9c26 Author: Dag-Erling Smørgrav AuthorDate: 2023-01-31 00:28:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-09 20:32:56 +0000 cmp: Print a summary on SIGINFO. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D38280 (cherry picked from commit 6673a5476d029cd5b47b2eed27032211a14f52bd) cmp: Increase buffer size for non-mmap case. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: rpokala Differential Revision: https://reviews.freebsd.org/D38281 (cherry picked from commit 134841a7f3e5516a83732d40a4d42268c901a492) --- usr.bin/cmp/cmp.c | 14 ++++++++++++++ usr.bin/cmp/extern.h | 4 ++++ usr.bin/cmp/regular.c | 7 +++++++ usr.bin/cmp/special.c | 9 +++++++++ 4 files changed, 34 insertions(+) diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 83ea7ae7eee0..82f34803fc22 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -75,6 +75,17 @@ static const struct option long_opts[] = {NULL, no_argument, NULL, 0} }; +#ifdef SIGINFO +volatile sig_atomic_t info; + +static void +siginfo(int signo) +{ + + info = signo; +} +#endif + static void usage(void); static bool @@ -240,6 +251,9 @@ main(int argc, char *argv[]) } } +#ifdef SIGINFO + (void)signal(SIGINFO, siginfo); +#endif if (special) c_special(fd1, file1, skip1, fd2, file2, skip2, limit); else { diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h index d98daf424995..60fd15ba0939 100644 --- a/usr.bin/cmp/extern.h +++ b/usr.bin/cmp/extern.h @@ -46,3 +46,7 @@ void diffmsg(const char *, const char *, off_t, off_t, int, int); void eofmsg(const char *); extern bool bflag, lflag, sflag, xflag, zflag; + +#ifdef SIGINFO +extern volatile sig_atomic_t info; +#endif diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index d270aeeac396..182a303f70ed 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -120,6 +120,13 @@ c_regular(int fd1, const char *file1, off_t skip1, off_t len1, p2 = m2 + (skip2 - off2); for (byte = line = 1; length--; ++byte) { +#ifdef SIGINFO + if (info) { + (void)fprintf(stderr, "%s %s char %zu line %zu\n", + file1, file2, (size_t)byte, (size_t)line); + info = 0; + } +#endif if ((ch = *p1) != *p2) { if (xflag) { dfound = 1; diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index c206a317c0ef..1342f2a86270 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -65,8 +65,10 @@ c_special(int fd1, const char *file1, off_t skip1, if ((fp1 = fdopen(fd1, "r")) == NULL) err(ERR_EXIT, "%s", file1); + (void)setvbuf(fp1, NULL, _IOFBF, 65536); if ((fp2 = fdopen(fd2, "r")) == NULL) err(ERR_EXIT, "%s", file2); + (void)setvbuf(fp2, NULL, _IOFBF, 65536); dfound = 0; while (skip1--) @@ -77,6 +79,13 @@ c_special(int fd1, const char *file1, off_t skip1, goto eof; for (byte = line = 1; limit == 0 || byte <= limit; ++byte) { +#ifdef SIGINFO + if (info) { + (void)fprintf(stderr, "%s %s char %zu line %zu\n", + file1, file2, (size_t)byte, (size_t)line); + info = 0; + } +#endif ch1 = getc(fp1); ch2 = getc(fp2); if (ch1 == EOF || ch2 == EOF)