From nobody Mon Mar 24 02:24:54 2025 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 4ZLcMW3G1Zz5r9jV; Mon, 24 Mar 2025 02:24:55 +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 4ZLcMV65Rjz49ZS; Mon, 24 Mar 2025 02:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742783095; 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=IxdQLlV0ng1jjzb2jzR9W370MbRxLArpC9gsI8eujjw=; b=rQNx6qRBuI26Z4l2WlNM7PU1VVPamDL+iz0r4tRj6zXW4pqXrrpUptxG8LKxykDfou3DKe b3kRpyeSKzRoZOKeuFZDmbhs1XMeJwe4gs9I0Wu2wfXU/gO+YP5bh9SdNTj+lvBdYoY7wo wrEIK7u1BqiCUkfrajOA3/SgzMIXAQVCnYOxNfl8Rc+U0uuAPQ45zzM1ersJUOtry30aNl oaqtS99R75KyMN/Y27KOq1Jn14Ky4Nn23cFxpYn6YOQ+gZZCQML8P3WuJQv6fHyONiUll/ GLx8x1+sRDBXtscXrYBGVoaBzFdoABu5kR7+eVuXA6cszAPMYCEFw4xFsa5KFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742783094; a=rsa-sha256; cv=none; b=taumpLZNKUicg11eo8HNtGEGJhZa6bB2qPNHfR5CwnKK8ysgaKnCwBy724uaqWGooy/RGb YuZzSjhhol7Z10Ek9t/qBgZlToHm4OiS30XYKzpkIMFvXI4kxfzU7p3WLjQ+U55ujizQIs q+ts0E0oSMySAZbNoWXuNRefxpvz8rgliAAlyB3YVedtb9POCq6wDmBs2/xgc9Gj42OPAU hkhF6eq1fCnlj300upFHYiMDb7xCGYQ5uJCfZk+KNt7ghi2Qr4f0aopxNA+TlR7B6tGaT4 2VBhkvBB60uPJz3nWQ5aKuQCVvWk/Z11lLs0D5z0FkMslVpTUh/U/V7TbZYSAw== 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=1742783094; 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=IxdQLlV0ng1jjzb2jzR9W370MbRxLArpC9gsI8eujjw=; b=qRwRV0cYkASmxYZ3R+9bHwPDZ2F5ynmgIfduCvTkZNtWPnf7l1j9ao7LwHmO1YKbGFeH5M zg41ockO6cQSecJanZOhzL5Sb9elJqAn0Q52q9YtTAflQrYULHwxTjMFz9f3Meq9XY2KQn BIdORnegLNVz8kSVLTO1bbpgHfA55KBmP+q83GTnRXGxEluCWcul/QY58tMup1hgT2qRxx HgTv5cs7IVGrKjuP5Xd7TF5C2ovO3A/U6tSmyI9P9KiuN1vr/AvzGL6Xw6KmgiPqWzXBxd xXOfNSwAnOJfqkdcOzroKKv/M7WTVaH0RCEhNJGbZwGSWyv5I7pOIEP5OiWtzg== 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 4ZLcMV5SgTzb2R; Mon, 24 Mar 2025 02:24:54 +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 52O2Os5O069917; Mon, 24 Mar 2025 02:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O2Osit069914; Mon, 24 Mar 2025 02:24:54 GMT (envelope-from git) Date: Mon, 24 Mar 2025 02:24:54 GMT Message-Id: <202503240224.52O2Osit069914@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: ba2fb6b367fd - main - libprocstat: change psc_type_info array to use designated initializers 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ba2fb6b367fd513ea5812a496254d3a05ec380b8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ba2fb6b367fd513ea5812a496254d3a05ec380b8 commit ba2fb6b367fd513ea5812a496254d3a05ec380b8 Author: Konstantin Belousov AuthorDate: 2025-03-15 00:28:07 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-24 02:24:14 +0000 libprocstat: change psc_type_info array to use designated initializers Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49372 --- 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 c02ab9511af7..83aabc50cc30 100644 --- a/lib/libprocstat/core.c +++ b/lib/libprocstat/core.c @@ -61,18 +61,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,