From owner-dev-commits-src-all@freebsd.org Sun Jan 10 12:16:38 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8AB864CA550; Sun, 10 Jan 2021 12:16:38 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DDG6G3SnQz4YRF; Sun, 10 Jan 2021 12:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 69A83156; Sun, 10 Jan 2021 12:16:38 +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 10ACGcqC098247; Sun, 10 Jan 2021 12:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10ACGcGr098246; Sun, 10 Jan 2021 12:16:38 GMT (envelope-from git) Date: Sun, 10 Jan 2021 12:16:38 GMT Message-Id: <202101101216.10ACGcGr098246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Watson Subject: git: 4f2cbaf3cd59 - main - Track pipe(2) reads and writes as rusage message receives and sends, a feature misplaced during the transition from BSD 4.4's socket implementation to the optimised FreeBSD pipe implementation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rwatson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f2cbaf3cd5900b06d3b5ad97db1962ec4fa0ffd Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2021 12:16:38 -0000 The branch main has been updated by rwatson: URL: https://cgit.FreeBSD.org/src/commit/?id=4f2cbaf3cd5900b06d3b5ad97db1962ec4fa0ffd commit 4f2cbaf3cd5900b06d3b5ad97db1962ec4fa0ffd Author: Robert Watson AuthorDate: 2021-01-01 13:04:46 +0000 Commit: Robert Watson CommitDate: 2021-01-10 12:16:39 +0000 Track pipe(2) reads and writes as rusage message receives and sends, a feature misplaced during the transition from BSD 4.4's socket implementation to the optimised FreeBSD pipe implementation. MFC after: 1 week Reviewed by: arichardson, imp Differential Revision: https://reviews.freebsd.org/D27878 --- sys/kern/sys_pipe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 76ab7bab05f7..558337794950 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -857,6 +857,8 @@ unlocked_error: pipeselwakeup(rpipe); PIPE_UNLOCK(rpipe); + if (nread > 0) + td->td_ru.ru_msgrcv++; return (error); } @@ -1314,6 +1316,8 @@ pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred, pipeunlock(wpipe); PIPE_UNLOCK(rpipe); + if (uio->uio_resid != orig_resid) + td->td_ru.ru_msgsnd++; return (error); }