From nobody Fri Aug 8 05:06:03 2025 X-Original-To: dev-commits-src-all@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 4bysSC5lybz64CVX; Fri, 08 Aug 2025 05:06:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bysSC58GGz3TcT; Fri, 08 Aug 2025 05:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754629563; 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=qTOtQERYUiBzVyTZvZ+cbp4ArARfH8xyOmTuQl71Lt8=; b=ieb41QaiI2CvPxSMYZZHTDuCL7iFF4X+Mu8Gu4jxjAlbQBuWzHJ0+bMOMTqakKxve3kx1+ /+wuXhNSJeitsFbrpJrQ3Fe6cf9L4jqh2bIr8cIyvJ2PE9KbVjN5q/oZDATgmakSOCwY4c 5tjtaVNQ5YRNTqntJOuHire/PkoOn+HoYBbD9htYqMJ/KE4vyg58Wnmg/6shE22Tlmsqu5 5/AWYeoivBEPlhwSx89uaczcg55oD4ZtQBHLw4J0eJZfZbIGOXb/Y1QQX+Qg6sLeCg2Lle 8SgTTdVOE1af3sQG6UBEKHxceGhcsF9mMFlMrsBTWX+EfvBdT+l0WFTUrimVzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754629563; 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=qTOtQERYUiBzVyTZvZ+cbp4ArARfH8xyOmTuQl71Lt8=; b=Z/BFSKN5+koJYqK3rquNAuSBskE1tk6sAl4T3D+90diG4qEaay2quwHFztpAJxeWixUdk0 tle02o48S2Mgh9PYg6mllWfCmVGWeWtHmIp9vaYQ12IVY4szEl+eVnzIMpW4qSPfloFV03 k4zs87XKzSM5KOvwZaO4N/pTX3ygEsj9b0X6m22iWUuMqZ1u8u0acuwLV4xcFtuXzrFoPD /NSmuL2VkP/qSc7jz5iSTL5x4HemwJ+ju550b/z+TVIypCWu8ShOk49HwllE4XKFm8zZUP FaO/v4gCunbXZC7+iNtl51FxOl85C67vYXEw6Q/Y0nzlng/RFMwhS3ucDvEYrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754629563; a=rsa-sha256; cv=none; b=E24fMKj1nnHq8zRV0jpbsGGsmtIZi8SgBXHF1O/H7aDMJT5lITNI0D+w+caVXvxsV0aZim TYr4agY8dW0A+j6FhQeAwjAcw8wsqwBxJDcnqs3meBsepQKF3OzLVHPIx2o+gF5l7bPpt+ /vTEA4Hs7WLxwl3dGuX/8MuK2i7ruTdqEQJO8tdGNRKxwXhokgO1x+2Es7hvHCdErbHXzC nSufkmc3mj8nFY6HKqM8Fi/J1OzG/QruJp8KR115RSK96N26YHlDWSYs/ZtzorktQHBBFP vo9J4PT6ynK7l/n/FdW11HVga1s24fra3mF+7b2DVsVYUAfdOQIRbTFpd9a93w== 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 4bysSC4ckmz6mR; Fri, 08 Aug 2025 05:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 578563UV079550; Fri, 8 Aug 2025 05:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578563qT079547; Fri, 8 Aug 2025 05:06:03 GMT (envelope-from git) Date: Fri, 8 Aug 2025 05:06:03 GMT Message-Id: <202508080506.578563qT079547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 7a7f74dbcc4f - main - grep: toss in some explicit fflush() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a7f74dbcc4f41d98218471297eaa629e34326e2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7f74dbcc4f41d98218471297eaa629e34326e2 commit 7a7f74dbcc4f41d98218471297eaa629e34326e2 Author: Kyle Evans AuthorDate: 2025-08-08 04:52:53 +0000 Commit: Kyle Evans CommitDate: 2025-08-08 05:05:10 +0000 grep: toss in some explicit fflush() grep|tee of the src/ tree for infrequently-occurring strings is fairly annoying; drop some tactical flushes at line-match boundaries to reduce the long stalls. In the case of `grep -o`, we'll flush after multiple lines if there are multiple matches within a single line of text, while for non`-o` we'll flush generally after every line. --- usr.bin/grep/util.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index ed87e56956f6..5b40405852b3 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -728,6 +728,8 @@ void grep_printline(struct str *line, int sep) { printline_metadata(line, sep); fwrite(line->dat, line->len, 1, stdout); putchar(fileeol); + + fflush(stdout); } static void @@ -834,6 +836,7 @@ printline(struct parsec *pc, int sep, size_t *last_out) *last_out = pc->ln.len; } putchar('\n'); + fflush(stdout); } else if (!oflag) { /* * -o is terminated on every match output, so this @@ -843,6 +846,8 @@ printline(struct parsec *pc, int sep, size_t *last_out) * to terminate if it needs to. */ terminated = false; + } else { + fflush(stdout); } } else grep_printline(&pc->ln, sep);