From nobody Mon Apr 21 22:11:57 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 4ZhKNF2dgKz5t71w; Mon, 21 Apr 2025 22:11:57 +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 4ZhKNF1sjrz3tTw; Mon, 21 Apr 2025 22:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745273517; 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=i7ql9YgjsRyiaRBJLuE2qGEvO532ELEiuclm2ycz4Lc=; b=qohuWyyBZawouIf1kRTiBDDlZeGVpN6WoTY285+UVSDq89ghJfrKi2JsuqYrASPCbvyuvc 1uuXBI2vHTWeogRP1SdH41DtlF8ra6lrAGWi3VmDURSUn/KTFDV2WUOOPj5tvOx0ulP303 FiITcbmMBU4vtxAuMWgMv7xeKO77vsXCo99wfE3FiaRf7L/kFAHc5P3GeKMA371Rs/NiwO wC5N943Q5bZxMiSNDEiur1JdPSbUkA8ZHgfVYjC7AGe8cNhZQJomD61+3bK6aAN7ZQPKHZ zZEFBIrxqC++RN8gFGbqLyGwE8hlrrP0IeYyFxDVSePePVuBQ5MufYXRWLzZGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745273517; a=rsa-sha256; cv=none; b=lWakifRfqeU0RpwRJ3siUs93LeYvxcOQLuF5d/8AWNwGxCul4zIvkstqi+HP1Lijy1XvBR hqv8ipdbF7xTvH+4KCu0V7TKOvf0zcDNzcSimg3w8ckjeqFssHxQWgdmw3wQ4KQu6XuBZh iRkAkbUZ86ASxFsRmJY7LeSWkg/Jz1sc/j8SaGpnzJYeA/uZyUu5nJvmi/+Q7++1W6Z2TK 8CQ1/GVqcPQ6QmXFHI5cViuB+80zwqXY27tUpk0gjwO8NuN9kc+ZolySMs8HQUJ8zD1oSC RWEV8pbc2CssxaQY1husCWulvzNSpidv0qFAquIkdrYMGq71fSQF96lnMWI9/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745273517; 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=i7ql9YgjsRyiaRBJLuE2qGEvO532ELEiuclm2ycz4Lc=; b=bFufusQVPgoBMzTgxFBy/AeCjX8FnW92z2vT5VPG+eOy9cCGMA3zlrt3TN1qpjc1piC1C9 qjZMMRvshzhxzurleazPGWA97ODWawkRFyhMbTmRrMjNpciOIpNrXLD/RREwP5Wro3GAIa MjqvOPu9io3FgxFXPVRjiqxlmG+VXwesL29KHuC/IWdU5loXJ5eciCf4rg+MdIx/+jCTOb utr+8uUdHYNbfGOokKflIjf77cg2BqqDdtGwYIwQdZanRwbTScM0xBthRijuiIVey7t/sA 0yc5dEV1fPkd+TFaOZATsXrZmHVnvokmQZz/6dXN90W+atYJgdac/yn0+jz3zg== 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 4ZhKNF1NRNz16nJ; Mon, 21 Apr 2025 22:11:57 +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 53LMBvPN040674; Mon, 21 Apr 2025 22:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LMBvh9040671; Mon, 21 Apr 2025 22:11:57 GMT (envelope-from git) Date: Mon, 21 Apr 2025 22:11:57 GMT Message-Id: <202504212211.53LMBvh9040671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 199a2be029e8 - main - sysctl.3: put KERN_PROC_RLIMIT_USAGE in the right spot 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 199a2be029e835c3b284d948e8168af378b06efc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=199a2be029e835c3b284d948e8168af378b06efc commit 199a2be029e835c3b284d948e8168af378b06efc Author: Konstantin Belousov AuthorDate: 2025-04-21 18:53:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-21 22:11:49 +0000 sysctl.3: put KERN_PROC_RLIMIT_USAGE in the right spot The order for KERN_PROC_XXX is by the OID values, at least for now. Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D49943 --- lib/libc/gen/sysctl.3 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index fb68ddd60edc..95e33dc802be 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -502,7 +502,6 @@ specifies the current process. .It Dv KERN_PROC_ENV Ta "Set of strings" .It Dv KERN_PROC_AUXV Ta "Elf_Auxinfo []" .It Dv KERN_PROC_RLIMIT Ta "Integer" -.It Dv KERN_PROC_RLIMIT_USAGE Ta "rlim_t []" .It Dv KERN_PROC_PS_STRINGS Ta "Integer" .It Dv KERN_PROC_UMASK Ta "Integer/short" .It Dv KERN_PROC_OSREL Ta "Integer" @@ -511,6 +510,7 @@ specifies the current process. .It Dv KERN_PROC_NFDS Ta "Integer" .It Dv KERN_PROC_SIGFASTBLK Ta "Integer" .It Dv KERN_PROC_VM_LAYOUT Ta "struct kinfo_vm_layout" +.It Dv KERN_PROC_RLIMIT_USAGE Ta "rlim_t []" .It Dv KERN_PROC_KQUEUE Ta "struct kinfo_knote []" .El .Pp @@ -549,13 +549,6 @@ Additinal OID name element must be supplied, specifiing the resource name as in .Xr getrlimit 2 . The call returns the given resource limit for the process. -.It Dv KERN_PROC_RLIMIT_USAGE -Like -.Dv KERN_PROC_RLIMIT , -but instead of the limit, returns the accounted resource usage. -For resources which do not have a meaningful current value, -.Li \-1 -is returned. .It Dv KERN_PROC_PS_STRINGS Returns the location of the .Vt ps_strings @@ -585,6 +578,13 @@ Returns the address of the location, if active. .It Dv KERN_PROC_VM_LAYOUT Fills a structure describing process virtual address space layout. +.It Dv KERN_PROC_RLIMIT_USAGE +Like +.Dv KERN_PROC_RLIMIT , +but instead of the limit, returns the accounted resource usage. +For resources which do not have a meaningful current value, +.Li \-1 +is returned. .It Dv KERN_PROC_KQUEUE Fills an array of structures describing events registered with the specified kqueue.