Add new options, -e and -x, to display process environment variables
and ELF auxiliary vectors. MFC after: 2 weeks
This commit is contained in:
parent
17ff418d13
commit
e99272c732
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=227838
@ -4,6 +4,7 @@ PROG= procstat
|
||||
MAN= procstat.1
|
||||
SRCS= procstat.c \
|
||||
procstat_args.c \
|
||||
procstat_auxv.c \
|
||||
procstat_basic.c \
|
||||
procstat_bin.c \
|
||||
procstat_cred.c \
|
||||
|
@ -25,7 +25,7 @@
|
||||
.\"
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd November 7, 2011
|
||||
.Dd November 22, 2011
|
||||
.Dt PROCSTAT 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -56,6 +56,8 @@ for printing:
|
||||
Display binary information for the process.
|
||||
.It Fl c
|
||||
Display command line arguments for the process.
|
||||
.It Fl e
|
||||
Display environment variables for the process.
|
||||
.It Fl f
|
||||
Display file descriptor information for the process.
|
||||
.It Fl i
|
||||
@ -73,6 +75,8 @@ Display security credential information for the process.
|
||||
Display thread information for the process.
|
||||
.It Fl v
|
||||
Display virtual memory mappings for the process.
|
||||
.It Fl x
|
||||
Display ELF auxiliary vector for the process.
|
||||
.El
|
||||
.Pp
|
||||
All options generate output in the format of a table, the first field of
|
||||
|
@ -39,7 +39,8 @@
|
||||
|
||||
#include "procstat.h"
|
||||
|
||||
static int aflag, bflag, cflag, fflag, iflag, jflag, kflag, sflag, tflag, vflag;
|
||||
static int aflag, bflag, cflag, eflag, fflag, iflag, jflag, kflag, sflag, tflag;
|
||||
static int vflag, xflag;
|
||||
int hflag, nflag, Cflag;
|
||||
|
||||
static void
|
||||
@ -47,8 +48,9 @@ usage(void)
|
||||
{
|
||||
|
||||
fprintf(stderr, "usage: procstat [-h] [-C] [-M core] [-N system] "
|
||||
"[-w interval] [-b | -c | -f | -i | -j | -k | -s | -t | -v]\n");
|
||||
fprintf(stderr, " [-a | pid ...]\n");
|
||||
"[-w interval] \n");
|
||||
fprintf(stderr, " [-b | -c | -e | -f | -i | -j | -k | "
|
||||
"-s | -t | -v | -x] [-a | pid ...]\n");
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
|
||||
@ -60,6 +62,8 @@ procstat(struct procstat *prstat, struct kinfo_proc *kipp)
|
||||
procstat_bin(kipp);
|
||||
else if (cflag)
|
||||
procstat_args(kipp);
|
||||
else if (eflag)
|
||||
procstat_env(kipp);
|
||||
else if (fflag)
|
||||
procstat_files(prstat, kipp);
|
||||
else if (iflag)
|
||||
@ -74,6 +78,8 @@ procstat(struct procstat *prstat, struct kinfo_proc *kipp)
|
||||
procstat_threads(kipp);
|
||||
else if (vflag)
|
||||
procstat_vm(kipp);
|
||||
else if (xflag)
|
||||
procstat_auxv(kipp);
|
||||
else
|
||||
procstat_basic(kipp);
|
||||
}
|
||||
@ -117,7 +123,7 @@ main(int argc, char *argv[])
|
||||
|
||||
interval = 0;
|
||||
memf = nlistf = NULL;
|
||||
while ((ch = getopt(argc, argv, "CN:M:abcfijkhstvw:")) != -1) {
|
||||
while ((ch = getopt(argc, argv, "CN:M:abcefijkhstvw:x")) != -1) {
|
||||
switch (ch) {
|
||||
case 'C':
|
||||
Cflag++;
|
||||
@ -141,6 +147,10 @@ main(int argc, char *argv[])
|
||||
cflag++;
|
||||
break;
|
||||
|
||||
case 'e':
|
||||
eflag++;
|
||||
break;
|
||||
|
||||
case 'f':
|
||||
fflag++;
|
||||
break;
|
||||
@ -186,6 +196,10 @@ main(int argc, char *argv[])
|
||||
interval = l;
|
||||
break;
|
||||
|
||||
case 'x':
|
||||
xflag++;
|
||||
break;
|
||||
|
||||
case '?':
|
||||
default:
|
||||
usage();
|
||||
@ -196,7 +210,8 @@ main(int argc, char *argv[])
|
||||
argv += optind;
|
||||
|
||||
/* We require that either 0 or 1 mode flags be set. */
|
||||
tmp = bflag + cflag + fflag + (kflag ? 1 : 0) + sflag + tflag + vflag;
|
||||
tmp = bflag + cflag + eflag + fflag + (kflag ? 1 : 0) + sflag + tflag +
|
||||
vflag + xflag;
|
||||
if (!(tmp == 0 || tmp == 1))
|
||||
usage();
|
||||
|
||||
|
@ -35,9 +35,11 @@ struct kinfo_proc;
|
||||
void kinfo_proc_sort(struct kinfo_proc *kipp, int count);
|
||||
|
||||
void procstat_args(struct kinfo_proc *kipp);
|
||||
void procstat_auxv(struct kinfo_proc *kipp);
|
||||
void procstat_basic(struct kinfo_proc *kipp);
|
||||
void procstat_bin(struct kinfo_proc *kipp);
|
||||
void procstat_cred(struct kinfo_proc *kipp);
|
||||
void procstat_env(struct kinfo_proc *kipp);
|
||||
void procstat_files(struct procstat *prstat, struct kinfo_proc *kipp);
|
||||
void procstat_kstack(struct kinfo_proc *kipp, int kflag);
|
||||
void procstat_sigs(struct procstat *prstat, struct kinfo_proc *kipp);
|
||||
|
@ -42,24 +42,26 @@
|
||||
|
||||
static char args[ARG_MAX];
|
||||
|
||||
void
|
||||
procstat_args(struct kinfo_proc *kipp)
|
||||
static void
|
||||
do_args(struct kinfo_proc *kipp, int env)
|
||||
{
|
||||
int error, name[4];
|
||||
size_t len;
|
||||
char *cp;
|
||||
|
||||
if (!hflag)
|
||||
printf("%5s %-16s %-53s\n", "PID", "COMM", "ARGS");
|
||||
printf("%5s %-16s %-53s\n", "PID", "COMM",
|
||||
env ? "ENVIRONMENT" : "ARGS");
|
||||
|
||||
name[0] = CTL_KERN;
|
||||
name[1] = KERN_PROC;
|
||||
name[2] = KERN_PROC_ARGS;
|
||||
name[2] = env ? KERN_PROC_ENV : KERN_PROC_ARGS;
|
||||
name[3] = kipp->ki_pid;
|
||||
len = sizeof(args);
|
||||
error = sysctl(name, 4, args, &len, NULL, 0);
|
||||
if (error < 0 && errno != ESRCH) {
|
||||
warn("sysctl: kern.proc.args: %d", kipp->ki_pid);
|
||||
if (error < 0 && errno != ESRCH && errno != EPERM) {
|
||||
warn("sysctl: kern.proc.%s: %d: %d", env ? "env" : "args",
|
||||
kipp->ki_pid, errno);
|
||||
return;
|
||||
}
|
||||
if (error < 0)
|
||||
@ -75,3 +77,15 @@ procstat_args(struct kinfo_proc *kipp)
|
||||
printf("%s%s", cp != args ? " " : "", cp);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
void
|
||||
procstat_args(struct kinfo_proc *kipp)
|
||||
{
|
||||
do_args(kipp, 0);
|
||||
}
|
||||
|
||||
void
|
||||
procstat_env(struct kinfo_proc *kipp)
|
||||
{
|
||||
do_args(kipp, 1);
|
||||
}
|
||||
|
180
usr.bin/procstat/procstat_auxv.c
Normal file
180
usr.bin/procstat/procstat_auxv.c
Normal file
@ -0,0 +1,180 @@
|
||||
/*-
|
||||
* Copyright (c) 2011 Mikolaj Golub
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* 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
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/user.h>
|
||||
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <libprocstat.h>
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <machine/elf.h>
|
||||
|
||||
#include "procstat.h"
|
||||
|
||||
static char auxv[sizeof(Elf_Auxinfo) * 256];
|
||||
|
||||
void
|
||||
procstat_auxv(struct kinfo_proc *kipp)
|
||||
{
|
||||
Elf_Auxinfo *aux;
|
||||
int i, error, name[4];
|
||||
size_t len;
|
||||
|
||||
if (!hflag)
|
||||
printf("%5s %-16s %-53s\n", "PID", "COMM", "AUXV");
|
||||
|
||||
name[0] = CTL_KERN;
|
||||
name[1] = KERN_PROC;
|
||||
name[2] = KERN_PROC_AUXV;
|
||||
name[3] = kipp->ki_pid;
|
||||
len = sizeof(auxv);
|
||||
error = sysctl(name, 4, auxv, &len, NULL, 0);
|
||||
if (error < 0 && errno != ESRCH) {
|
||||
warn("sysctl: kern.proc.auxv: %d: %d", kipp->ki_pid, errno);
|
||||
return;
|
||||
}
|
||||
if (error < 0)
|
||||
return;
|
||||
printf("%5d ", kipp->ki_pid);
|
||||
printf("%-16s", kipp->ki_comm);
|
||||
if (len == 0) {
|
||||
printf(" -\n");
|
||||
return;
|
||||
}
|
||||
for (aux = (Elf_Auxinfo *)auxv, i = 0; i < 256; i++, aux++) {
|
||||
switch(aux->a_type) {
|
||||
case AT_NULL:
|
||||
printf(" (%d)\n", i + 1);
|
||||
return;
|
||||
case AT_IGNORE:
|
||||
printf(" AT_IGNORE=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_EXECFD:
|
||||
printf(" AT_EXECFD=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_PHDR:
|
||||
printf(" AT_PHDR=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_PHENT:
|
||||
printf(" AT_PHENT=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_PHNUM:
|
||||
printf(" AT_PHNUM=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_PAGESZ:
|
||||
printf(" AT_PAGESZ=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_BASE:
|
||||
printf(" AT_BASE=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_FLAGS:
|
||||
printf(" AT_FLAGS=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_ENTRY:
|
||||
printf(" AT_ENTRY=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_NOTELF:
|
||||
printf(" AT_NOTELF=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_UID:
|
||||
printf(" AT_UID=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_EUID:
|
||||
printf(" AT_EUID=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_GID:
|
||||
printf(" AT_GID=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_EGID:
|
||||
printf(" AT_EGID=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_EXECPATH:
|
||||
printf(" AT_EXECPATH=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_CANARY:
|
||||
printf(" AT_CANARY=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_CANARYLEN:
|
||||
printf(" AT_CANARYLEN=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_OSRELDATE:
|
||||
printf(" AT_OSRELDATE=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_NCPUS:
|
||||
printf(" AT_NCPUS=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_PAGESIZES:
|
||||
printf(" AT_PAGESIZES=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_PAGESIZESLEN:
|
||||
printf(" AT_PAGESIZESLEN=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_STACKPROT:
|
||||
printf(" AT_STACKPROT=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
case AT_COUNT:
|
||||
printf(" AT_COUNT=0x%lu",
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
default:
|
||||
printf(" %ld=0x%lu", (long)aux->a_type,
|
||||
(unsigned long)aux->a_un.a_val);
|
||||
break;
|
||||
}
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user