From nobody Mon Mar 31 02:41:52 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 4ZQwPr6KfXz5sTV9; Mon, 31 Mar 2025 02:41:52 +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 4ZQwPr4PG5z43KW; Mon, 31 Mar 2025 02:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743388912; 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=BbnRGKPlhMU0CpkeXc0zRWrIAbkoq0JfleZTVxWpmbc=; b=DJ/R+XEotc8JHnDHJn7mKdK3apeZmZknmtSltOQkjPR/yjErWINg68zg1LI/Y8jZ9n4N4W 1TDljw0W4azGcVJQpxLU0YCmA6W1VYMeh3FGLUOH/FTp9Qk1GNP99YwRsnDLMYI6iXykGK BrZR69aK0jQIUPSC7uxNDONK8papfO6VBoo/EHkI5h2ZI+8kT4uoWuXk+yS9SfJqemp4dD URWg3NBkIjDDK7+192NXD8Xzjohvu0+9+MHXcgoODWxIzIm5YbBteyv4zUHsRkB1IBHWmJ btVxFNF8U5vFOZ8gz+Wqo8i3yP+igt646Jn/oaCKIM41P01V5628t+9iayxlQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743388912; a=rsa-sha256; cv=none; b=GNgVL8IumTbPF0lg/7bE1jC+0lKYb7LkM0ked3FXfsol1C2wb+SpfwE0W5lzup1wmKUzYG DcDROwmAcP9gVPk2pDB9+MgZSmByO28lyDv5+Nitmm/wHOOnOe8lrR30AWbOOpO9pYXJtN 6OP0FCCu3C3IPWDjwfH+ueCdSqrJhWuvfk9tayV3ZL3zRa73xnThh+ObCBeU5QpJc03yIx /6ulUaYjnUm4JIVKnyOCNoXqsTTNQe/g76xFCQfM7XP7/bNm19Xr63ST2IFKWqcALvSPQh Fj8Nxhhpd16WlWHJcXZLwOfX3i1pqYNEbh3jYIv/MKYHKbLNMwK8PbloMhUnzQ== 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=1743388912; 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=BbnRGKPlhMU0CpkeXc0zRWrIAbkoq0JfleZTVxWpmbc=; b=qu6Lwb67GlLN+1pdXBGxM9jIbTpFlOxpMlD08jDAt8kFcfPV0IdDh+3gm8fxXcF7Vbc116 Zz0j+juspmUsk9G1hP2Rgi3f3YfrN6ZbKSH1/7326BWY6KEjCnP9FG9yUqPmRBR7lrXfrU U+d8yJuoIwq8PeYySS3m0E3GzvREyO3/NvGsndj81cFh0xeVMjmEBbvviF7JeQpNoIHICZ E466tRb6p4h5elkcITHfs2ZTJdvmVYaodyrMJq3H/70WkGaspfOb5JesHIwlVlZ+hrjMqo LhFPmndZRX/vis3KcbrChJxcH2VvzCnQ5lSPUQJdESHMHfkEuVaAiMdKbncs6A== 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 4ZQwPr3w44z9SX; Mon, 31 Mar 2025 02:41:52 +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 52V2fqEF064275; Mon, 31 Mar 2025 02:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52V2fqLl064272; Mon, 31 Mar 2025 02:41:52 GMT (envelope-from git) Date: Mon, 31 Mar 2025 02:41:52 GMT Message-Id: <202503310241.52V2fqLl064272@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: 8056c9649171 - stable/14 - libprocstat: change psc_type_info array to use designated initializers 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8056c964917156e5a824a5fa78826b7746ce7567 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8056c964917156e5a824a5fa78826b7746ce7567 commit 8056c964917156e5a824a5fa78826b7746ce7567 Author: Konstantin Belousov AuthorDate: 2025-03-15 00:28:07 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-31 02:41:32 +0000 libprocstat: change psc_type_info array to use designated initializers (cherry picked from commit ba2fb6b367fd513ea5812a496254d3a05ec380b8) --- lib/libprocstat/core.c | 60 ++++++++++++++++++++++++++++++++++++++++---------- lib/libprocstat/core.h | 2 +- 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/lib/libprocstat/core.c b/lib/libprocstat/core.c index cf3435a10c79..1f64e728b0af 100644 --- a/lib/libprocstat/core.c +++ b/lib/libprocstat/core.c @@ -62,18 +62,54 @@ static struct psc_type_info { unsigned int n_type; int structsize; } psc_type_info[PSC_TYPE_MAX] = { - { .n_type = NT_PROCSTAT_PROC, .structsize = sizeof(struct kinfo_proc) }, - { .n_type = NT_PROCSTAT_FILES, .structsize = sizeof(struct kinfo_file) }, - { .n_type = NT_PROCSTAT_VMMAP, .structsize = sizeof(struct kinfo_vmentry) }, - { .n_type = NT_PROCSTAT_GROUPS, .structsize = sizeof(gid_t) }, - { .n_type = NT_PROCSTAT_UMASK, .structsize = sizeof(u_short) }, - { .n_type = NT_PROCSTAT_RLIMIT, .structsize = sizeof(struct rlimit) * RLIM_NLIMITS }, - { .n_type = NT_PROCSTAT_OSREL, .structsize = sizeof(int) }, - { .n_type = NT_PROCSTAT_PSSTRINGS, .structsize = sizeof(vm_offset_t) }, - { .n_type = NT_PROCSTAT_PSSTRINGS, .structsize = sizeof(vm_offset_t) }, - { .n_type = NT_PROCSTAT_PSSTRINGS, .structsize = sizeof(vm_offset_t) }, - { .n_type = NT_PROCSTAT_AUXV, .structsize = sizeof(Elf_Auxinfo) }, - { .n_type = NT_PTLWPINFO, .structsize = sizeof(struct ptrace_lwpinfo) }, + [PSC_TYPE_PROC] = { + .n_type = NT_PROCSTAT_PROC, + .structsize = sizeof(struct kinfo_proc) + }, + [PSC_TYPE_FILES] = { + .n_type = NT_PROCSTAT_FILES, + .structsize = sizeof(struct kinfo_file) + }, + [PSC_TYPE_VMMAP] = { + .n_type = NT_PROCSTAT_VMMAP, + .structsize = sizeof(struct kinfo_vmentry) + }, + [PSC_TYPE_GROUPS] = { + .n_type = NT_PROCSTAT_GROUPS, + .structsize = sizeof(gid_t) + }, + [PSC_TYPE_UMASK] = { + .n_type = NT_PROCSTAT_UMASK, + .structsize = sizeof(u_short) + }, + [PSC_TYPE_RLIMIT] = { + .n_type = NT_PROCSTAT_RLIMIT, + .structsize = sizeof(struct rlimit) * RLIM_NLIMITS + }, + [PSC_TYPE_OSREL] = { + .n_type = NT_PROCSTAT_OSREL, + .structsize = sizeof(int) + }, + [PSC_TYPE_PSSTRINGS] = { + .n_type = NT_PROCSTAT_PSSTRINGS, + .structsize = sizeof(vm_offset_t) + }, + [PSC_TYPE_ARGV] = { + .n_type = NT_PROCSTAT_PSSTRINGS, + .structsize = sizeof(vm_offset_t) + }, + [PSC_TYPE_ENVV] = { + .n_type = NT_PROCSTAT_PSSTRINGS, + .structsize = sizeof(vm_offset_t) + }, + [PSC_TYPE_AUXV] = { + .n_type = NT_PROCSTAT_AUXV, + .structsize = sizeof(Elf_Auxinfo) + }, + [PSC_TYPE_PTLWPINFO] = { + .n_type = NT_PTLWPINFO, + .structsize = sizeof(struct ptrace_lwpinfo) + }, }; static bool core_offset(struct procstat_core *core, off_t offset); diff --git a/lib/libprocstat/core.h b/lib/libprocstat/core.h index d6cb60dc9e25..8f6aa40192da 100644 --- a/lib/libprocstat/core.h +++ b/lib/libprocstat/core.h @@ -31,7 +31,7 @@ #define _CORE_H enum psc_type { - PSC_TYPE_PROC, + PSC_TYPE_PROC = 0, PSC_TYPE_FILES, PSC_TYPE_VMMAP, PSC_TYPE_GROUPS,