From nobody Sun Feb 13 13:07:19 2022 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 5555B19BC865; Sun, 13 Feb 2022 13:07:20 +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 4JxSLb6hH7z3J6S; Sun, 13 Feb 2022 13:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644757640; 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=aBY7TTqCuP2lIAy3e6rozbStIWR3B3i26zmqn0e9BS0=; b=yb7verZ93Evz2SAZWG3SM8M1LVsFB0vEhHmAIIG303FoIRCnS/vN/xvnfFaPWuVcrQiTZW fxDCa7HrBd1fgk9IMxbb02XygRsFKgNFtYGmTukVEmcCP/skAGWu+5Yzehkq6N6NAyptDl I6+ts1P30x1b/lDow2i8s9zuDJ4JD2agTAO0L4AZWwBuniqiPOtJqaDOQzxaVZTrh2gLHD yJ2IqIdzYxJsOnL/4SlNKyhNzXyWGDr99G2m/70r7WYqFtQLiPtEiELCb4KNGvkiM+s4z0 eViKubzkv2G7Or9gZu1rA0FUQS2RmJqHL9fBi4smZd+cXOYcDqJpCaG09Hwmbg== 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 BCA191BD89; Sun, 13 Feb 2022 13:07:19 +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 21DD7JvA074039; Sun, 13 Feb 2022 13:07:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DD7JfA074038; Sun, 13 Feb 2022 13:07:19 GMT (envelope-from git) Date: Sun, 13 Feb 2022 13:07:19 GMT Message-Id: <202202131307.21DD7JfA074038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 60b699f99c81 - main - fd: add FILEDESC_FOREACH_{FDE,FP} 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60b699f99c81fcc182c2ac7a5182545016811393 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644757640; 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=aBY7TTqCuP2lIAy3e6rozbStIWR3B3i26zmqn0e9BS0=; b=aN18qn/slnPkaZn17oIbRu4XQ1eF7/7ZSRn+ZKKJ2NHAdalQqbbbFt1h39Ez3TUx/LSNTz UvyQZfEeBvQ4UCIpMcKL85Gee2slhxLcThhqvRfG+1LXLZz+Av7sxrsGqoSwWAQK1enMdw 20adM4tIrQ4+b9xCUM+1M16wV+7F81CG2/+rOKlD555DrAzYjTv7E2sVP20k3ZwVuOANqv sP5G93Q9nb8Tpqzqp5/9v7V1IGTA4BW4EzJ9ZXqytz6uU0mI7Kea6XMGIal5DsmBYrO1Jg BL6uN4p0KbNjcRpAMGawwlqaerKjTcwjBgpvYkvE3I8GfxfmmWZK+Cn1rzDtDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644757640; a=rsa-sha256; cv=none; b=cUvm4irukTjVWPH6fYfbsJSAYCOl3wERCOgkBgerOv0/yO0nxbuJfBrG28ulIy9tCK6z8+ oULM4o9UBCrnXWKGb2mvwYuibEN+Yxk0aXYVsAHxrfz+Mo2zqaTcmU0UttbZDKhRXoj11k qcoHzZ2OdK68aF6uSbwd2lnPMRvPelh1vzS48mdRlorWsom39Tuvj86bm+49jvbhAOQeB9 jNtMS9JZzof3QaEZGahr98NUFnZRTvOOS6OyA+i5lSvZ58s44aU5REaYL2iu7ftOE6Knwd 4ZYkidvxOhWACZyfCb/vH2SmRut6gdY/OJbXM4Wdjiz/2PnMWACESvVxhkHb4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=60b699f99c81fcc182c2ac7a5182545016811393 commit 60b699f99c81fcc182c2ac7a5182545016811393 Author: Mateusz Guzik AuthorDate: 2022-01-29 22:19:18 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-13 13:07:08 +0000 fd: add FILEDESC_FOREACH_{FDE,FP} Right now they naively walk the fd table just like all the other code, but that's going to change. --- sys/sys/filedesc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 0560a517c160..ed1f8989358e 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -183,6 +183,18 @@ struct filedesc_to_leader { MPASS(curproc->p_fd == _fdp); \ (curproc->p_numthreads == 1 && refcount_load(&_fdp->fd_refcnt) == 1); \ }) +#define FILEDESC_FOREACH_FDE(fdp, _iterator, _fde) \ + struct filedesc *_fdp = (fdp); \ + int _lastfile = fdlastfile_single(_fdp); \ + for (_iterator = 0; _iterator <= _lastfile; _iterator++) \ + if ((_fde = &_fdp->fd_ofiles[_iterator])->fde_file != NULL) + +#define FILEDESC_FOREACH_FP(fdp, _iterator, _fp) \ + struct filedesc *_fdp = (fdp); \ + int _lastfile = fdlastfile_single(_fdp); \ + for (_iterator = 0; _iterator <= _lastfile; _iterator++) \ + if ((_fp = _fdp->fd_ofiles[_iterator].fde_file) != NULL) + #else /*