Page MenuHomeFreeBSD
Differential D26310 Diff 77017 usr.bin/procstat/procstat.h

Changeset View

Standalone View

View Options

usr.bin/procstat/procstat.h

/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
* *
* Copyright (c) 2007 Robert N. M. Watson * Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org> * Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* Copyright (c) 2017 Dell EMC * Copyright (c) 2017 Dell EMC
* Copyright (c) 2020 Juraj Lutter <juraj@lutter.sk>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
Show All 11 Lines
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#include <libxo/xo.h> #include <libxo/xo.h>
kibUnsubmitted
Done
Inline Actions

No, for headers it is still correct to put $FreeBSD$ as comment.
Look at the kernel sources.

kib: No, for headers it is still correct to put $FreeBSD$ as comment. Look at the kernel sources.
#ifndef PROCSTAT_H #ifndef PROCSTAT_H
#define PROCSTAT_H #define PROCSTAT_H
#define PROCSTAT_XO_VERSION "1" #define PROCSTAT_XO_VERSION "1"
enum { enum {
PS_OPT_CAPABILITIES = 0x01, PS_OPT_CAPABILITIES = 0x01,
PS_OPT_NOHEADER = 0x02, PS_OPT_NOHEADER = 0x02,
PS_OPT_PERTHREAD = 0x04, PS_OPT_PERTHREAD = 0x04,
PS_OPT_SIGNUM = 0x08, PS_OPT_SIGNUM = 0x08,
PS_OPT_VERBOSE = 0x10 PS_OPT_VERBOSE = 0x10,
PS_OPT_NOPIDSTR = 0x20,
PS_OPT_LISTOPENED = 0x40
}; };
enum {
PS_MODE_NORMAL = 0x00,
PS_MODE_COMPAT = 0x01
};
#define PS_SUBCOMMAND_OPTS \ #define PS_SUBCOMMAND_OPTS \
(PS_OPT_CAPABILITIES | PS_OPT_SIGNUM | \ (PS_OPT_CAPABILITIES | PS_OPT_SIGNUM | \
PS_OPT_PERTHREAD | PS_OPT_VERBOSE) PS_OPT_PERTHREAD | PS_OPT_VERBOSE)
extern int procstat_opts; extern int procstat_opts;
extern int procstat_mode;
extern const char * xocontainer;
struct kinfo_proc; struct kinfo_proc;
void kinfo_proc_sort(struct kinfo_proc *kipp, int count); void kinfo_proc_sort(struct kinfo_proc *kipp, int count);
const char * kinfo_proc_thread_name(const struct kinfo_proc *kipp); const char * kinfo_proc_thread_name(const struct kinfo_proc *kipp);
void procstat_args(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_args(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_auxv(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_auxv(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_basic(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_basic(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_bin(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_bin(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_cred(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_cred(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_cs(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_cs(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_env(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_env(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_files(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_files(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_kstack(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_kstack(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_ptlwpinfo(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_ptlwpinfo(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_rlimit(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_rlimit(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_rusage(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_rusage(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_sigfastblock(struct procstat *procstat, void procstat_sigfastblock(struct procstat *procstat,
struct kinfo_proc *kipp); struct kinfo_proc *kipp);
void procstat_sigs(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_sigs(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_threads(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_threads(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_threads_sigs(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_threads_sigs(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_vm(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_vm(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_compat_pwdx(struct procstat *prstat, struct kinfo_proc *kipp);
kibUnsubmitted
Done
Inline Actions

I suggest dropping '_compat' from the name, it is relevant for users that come from Solaris perhaps, but completely irrelevant for the implementation. Also order declarations alphabetically.

kib: I suggest dropping '_compat' from the name, it is relevant for users that come from Solaris…
void procstat_compat_penv(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_compat_pargs(struct procstat *prstat, struct kinfo_proc *kipp);
#endif /* !PROCSTAT_H */ #endif /* !PROCSTAT_H */