From nobody Thu Apr 24 00:29:06 2025 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 4ZjcKb1YMwz5t8K0; Thu, 24 Apr 2025 00:29:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjcKZ5TPMz41lx; Thu, 24 Apr 2025 00:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745454546; 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=M89h76S8nXmlffxQyGkYi5JNL5GecahnIDHL8WEhSok=; b=UP84jyzoxhK2Bh6Y+yotDsxsJbMK9v21HvhzR3vxgpQTF9GnpC1lVGRvC35dDs8pZ8NyV8 c7nKxcluvtkP9gFxEGRfzJmixiWc3rykBn+39pI0fNtkJJN9jkcKDI8wKF1BPuqLEFB24h vl3WRtfDXlLQPOHDOrDLGiaUOsa5YCjVjGgV9ikgWGm7FNqUzhW+2mgWw7MXkU01BSPOsF XcXAkOkTKtzsiXU1k++ird6SgLCYgtRzKH91ExBd0/3lk0KqEXjim3Jr6Zkw35ihvqj545 ZkRFVZb+sVPX1qC6HHO83NF0QHfWxcFqdZBma04gVm+oHe1iJMPGaw10gEoTlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745454546; a=rsa-sha256; cv=none; b=e3wQheP4SScr8FMlSvA/TvArSflynmdYlgIb467QpTvqfdf3k+VN4e879fbhOQz6ggG66p lL7G4+YUG9xwoBIBABmvfI/2HJ64NRKR30gU0V7SyJhIYtz6mSzCYoiAVgyex1vm5C61cF eR1z9SgSSzFu7H1MnqnkPPQilFaGrlrLPpAWQPFyiqAJPP80gOIdSQAOUtJ+JNP8aexjMx 1STBkWhurwv5LykBu8ssydImG1QwxfxWCq/S1xWEiJD3Wy8lPyhR0QFaWv6rjT0oZApopl 3NlR3lpTrT7eGDcRg4dIVGsuaD2wsXifSBCjsKNLstdPTPAwgKvBcTbsv692RA== 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=1745454546; 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=M89h76S8nXmlffxQyGkYi5JNL5GecahnIDHL8WEhSok=; b=iUbCIaxBVfE3uRuU5+WySfXSY7c/dQ//NnGqIKyDJW4mwys5V7Aqt+GCrk62OmafAkjIYr g0NHl267L3kSTux3pgKUP/ny13xSX4oIizUvl87lRK/5t+xuxo/RXtEjlTuwyRCGozicI8 QS5E2Qpowq/A1hSc08P+hHqoA45hX5a2P/vGyWJ8M3+JYNZTOZhjPT8ZxZR4fFxNabKQkX uVwIREayX3GuYoIZZha6VQYJuOyPJQ4vO3hfhrOcosYcF1UylQ4FlZSZnjqn9yT3G9IeOP OVlZ9JKhlWPIzLfRo3t1SQp8nqk+/XPQaptecnhXJnFqgKpbLWqf1Z1IbeBTdw== 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 4ZjcKZ54XHzB17; Thu, 24 Apr 2025 00:29:06 +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 53O0T6rr084571; Thu, 24 Apr 2025 00:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53O0T6pr084568; Thu, 24 Apr 2025 00:29:06 GMT (envelope-from git) Date: Thu, 24 Apr 2025 00:29:06 GMT Message-Id: <202504240029.53O0T6pr084568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 81fc9469313b - stable/14 - sysctl.3: put KERN_PROC_RLIMIT_USAGE in the right spot 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 81fc9469313bc92138d73906622390d5bca5e444 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81fc9469313bc92138d73906622390d5bca5e444 commit 81fc9469313bc92138d73906622390d5bca5e444 Author: Konstantin Belousov AuthorDate: 2025-04-21 18:53:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-24 00:28:31 +0000 sysctl.3: put KERN_PROC_RLIMIT_USAGE in the right spot (cherry picked from commit 199a2be029e835c3b284d948e8168af378b06efc) --- 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 213c3463a7cc..a87aa7772413 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -504,7 +504,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" @@ -513,6 +512,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 @@ -551,13 +551,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 @@ -587,6 +580,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.