Author: trociny
Date: Thu Feb 2 18:17:49 2012
New Revision: 230917
URL: http://svn.freebsd.org/changeset/base/230917
Log:
MFC r227838, r227873, r228025, r228049, r228289, r228447, r230753:
r227838, r227873:
Add new options, -e and -x, to display process environment variables
and ELF auxiliary vectors.
r228025, r228049:
Make proctstat -x output more readable.
This also fixes the issue, spotted by mdf, with values that were
printed as decimal and had hex prefixes.
Discussed with: kib, rwatson
r228289:
Don't output a warning if kern.proc.auxv sysctl has returned EPERM.
After r228288 this is rather a normal situation.
r228447:
Make 64-bit procstat output ELF auxiliary vectors for 32-bit processes.
Reviewed by: kib
r230753:
Always return 0 if the sysctl failed.
This fixes the bug: when procstat -xa was run and the sysctl for a
process returned ESRCH or EPERM, for this process procstat output the
result collected for the previous successful process.
Added:
stable/9/usr.bin/procstat/procstat_auxv.c
- copied, changed from r227838, head/usr.bin/procstat/procstat_auxv.c
Modified:
stable/9/usr.bin/procstat/Makefile
stable/9/usr.bin/procstat/procstat.1
stable/9/usr.bin/procstat/procstat.c
stable/9/usr.bin/procstat/procstat.h
stable/9/usr.bin/procstat/procstat_args.c
Directory Properties:
stable/9/usr.bin/procstat/ (props changed)
Modified: stable/9/usr.bin/procstat/Makefile
==============================================================================
--- stable/9/usr.bin/procstat/Makefile Thu Feb 2 17:54:35 2012
(r230916)
+++ stable/9/usr.bin/procstat/Makefile Thu Feb 2 18:17:49 2012
(r230917)
@@ -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 \
Modified: stable/9/usr.bin/procstat/procstat.1
==============================================================================
--- stable/9/usr.bin/procstat/procstat.1 Thu Feb 2 17:54:35 2012
(r230916)
+++ stable/9/usr.bin/procstat/procstat.1 Thu Feb 2 18:17:49 2012
(r230917)
@@ -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
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
Modified: stable/9/usr.bin/procstat/procstat.c
==============================================================================
--- stable/9/usr.bin/procstat/procstat.c Thu Feb 2 17:54:35 2012
(r230916)
+++ stable/9/usr.bin/procstat/procstat.c Thu Feb 2 18:17:49 2012
(r230917)
@@ -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
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
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();
Modified: stable/9/usr.bin/procstat/procstat.h
==============================================================================
--- stable/9/usr.bin/procstat/procstat.h Thu Feb 2 17:54:35 2012
(r230916)
+++ stable/9/usr.bin/procstat/procstat.h Thu Feb 2 18:17:49 2012
(r230917)
@@ -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);
Modified: stable/9/usr.bin/procstat/procstat_args.c
==============================================================================
--- stable/9/usr.bin/procstat/procstat_args.c Thu Feb 2 17:54:35 2012
(r230916)
+++ stable/9/usr.bin/procstat/procstat_args.c Thu Feb 2 18:17:49 2012
(r230917)
@@ -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);
+}
Copied and modified: stable/9/usr.bin/procstat/procstat_auxv.c (from r227838,
head/usr.bin/procstat/procstat_auxv.c)
==============================================================================
--- head/usr.bin/procstat/procstat_auxv.c Tue Nov 22 20:59:52 2011
(r227838, copy source)
+++ stable/9/usr.bin/procstat/procstat_auxv.c Thu Feb 2 18:17:49 2012
(r230917)
@@ -27,9 +27,12 @@
*/
#include <sys/param.h>
+#include <sys/elf.h>
#include <sys/sysctl.h>
#include <sys/user.h>
+#include <vm/vm.h>
+
#include <err.h>
#include <errno.h>
#include <libprocstat.h>
@@ -38,140 +41,201 @@
#include <stdlib.h>
#include <string.h>
-#include <machine/elf.h>
-
#include "procstat.h"
-static char auxv[sizeof(Elf_Auxinfo) * 256];
+#define PROC_AUXV_MAX 256
-void
-procstat_auxv(struct kinfo_proc *kipp)
+static Elf_Auxinfo auxv[PROC_AUXV_MAX];
+static char prefix[256];
+
+#if __ELF_WORD_SIZE == 64
+static Elf32_Auxinfo auxv32[PROC_AUXV_MAX];
+
+static const char *elf32_sv_names[] = {
+ "Linux ELF32",
+ "FreeBSD ELF32",
+};
+
+static int
+is_elf32(pid_t pid)
{
- Elf_Auxinfo *aux;
- int i, error, name[4];
- size_t len;
+ int error, name[4];
+ size_t len, i;
+ static char sv_name[256];
- if (!hflag)
- printf("%5s %-16s %-53s\n", "PID", "COMM", "AUXV");
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_SV_NAME;
+ name[3] = pid;
+ len = sizeof(sv_name);
+ error = sysctl(name, 4, sv_name, &len, NULL, 0);
+ if (error != 0 || len == 0)
+ return (0);
+ for (i = 0; i < sizeof(elf32_sv_names) / sizeof(*elf32_sv_names); i++) {
+ if (strncmp(sv_name, elf32_sv_names[i], sizeof(sv_name)) == 0)
+ return (1);
+ }
+ return (0);
+}
+
+static size_t
+retrieve_auxv32(pid_t pid)
+{
+ int name[4];
+ size_t len, i;
+ void *ptr;
+
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_AUXV;
+ name[3] = pid;
+ len = sizeof(auxv32);
+ if (sysctl(name, 4, auxv32, &len, NULL, 0) == -1) {
+ if (errno != ESRCH && errno != EPERM)
+ warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
+ return (0);
+ }
+ for (i = 0; i < len; i++) {
+ /*
+ * XXX: We expect that values for a_type on a 32-bit platform
+ * are directly mapped to those on 64-bit one, which is not
+ * necessarily true.
+ */
+ auxv[i].a_type = auxv32[i].a_type;
+ ptr = &auxv32[i].a_un;
+ auxv[i].a_un.a_val = *((uint32_t *)ptr);
+ }
+ return (len);
+}
+#endif /* __ELF_WORD_SIZE == 64 */
+
+#define PRINT(name, spec, val) \
+ printf("%s %-16s " #spec "\n", prefix, #name, (val))
+#define PRINT_UNKNOWN(type, val) \
+ printf("%s %16ld %#lx\n", prefix, (long)type, (u_long)(val))
+static size_t
+retrieve_auxv(pid_t pid)
+{
+ int name[4];
+ size_t len;
+
+#if __ELF_WORD_SIZE == 64
+ if (is_elf32(pid))
+ return (retrieve_auxv32(pid));
+#endif
name[0] = CTL_KERN;
name[1] = KERN_PROC;
name[2] = KERN_PROC_AUXV;
- name[3] = kipp->ki_pid;
+ name[3] = 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 (sysctl(name, 4, auxv, &len, NULL, 0) == -1) {
+ if (errno != ESRCH && errno != EPERM)
+ warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
+ return (0);
}
- if (error < 0)
- return;
- printf("%5d ", kipp->ki_pid);
- printf("%-16s", kipp->ki_comm);
- if (len == 0) {
- printf(" -\n");
+ return (len);
+}
+
+void
+procstat_auxv(struct kinfo_proc *kipp)
+{
+ size_t len, i;
+
+ if (!hflag)
+ printf("%5s %-16s %-16s %-16s\n", "PID", "COMM", "AUXV",
"VALUE");
+ len = retrieve_auxv(kipp->ki_pid);
+ if (len == 0)
return;
- }
- for (aux = (Elf_Auxinfo *)auxv, i = 0; i < 256; i++, aux++) {
- switch(aux->a_type) {
+ snprintf(prefix, sizeof(prefix), "%5d %-16s", kipp->ki_pid,
+ kipp->ki_comm);
+ for (i = 0; i < len; i++) {
+ switch(auxv[i].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);
+ PRINT(AT_EXECFD, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_PHDR:
- printf(" AT_PHDR=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_PHDR, %p, auxv[i].a_un.a_ptr);
break;
case AT_PHENT:
- printf(" AT_PHENT=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_PHENT, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_PHNUM:
- printf(" AT_PHNUM=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_PHNUM, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_PAGESZ:
- printf(" AT_PAGESZ=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_PAGESZ, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_BASE:
- printf(" AT_BASE=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_BASE, %p, auxv[i].a_un.a_ptr);
break;
case AT_FLAGS:
- printf(" AT_FLAGS=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_FLAGS, %#lx, (u_long)auxv[i].a_un.a_val);
break;
case AT_ENTRY:
- printf(" AT_ENTRY=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_ENTRY, %p, auxv[i].a_un.a_ptr);
break;
+#ifdef AT_NOTELF
case AT_NOTELF:
- printf(" AT_NOTELF=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_NOTELF, %ld, (long)auxv[i].a_un.a_val);
break;
+#endif
+#ifdef AT_UID
case AT_UID:
- printf(" AT_UID=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_UID, %ld, (long)auxv[i].a_un.a_val);
break;
+#endif
+#ifdef AT_EUID
case AT_EUID:
- printf(" AT_EUID=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_EUID, %ld, (long)auxv[i].a_un.a_val);
break;
+#endif
+#ifdef AT_GID
case AT_GID:
- printf(" AT_GID=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_GID, %ld, (long)auxv[i].a_un.a_val);
break;
+#endif
+#ifdef AT_EGID
case AT_EGID:
- printf(" AT_EGID=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_EGID, %ld, (long)auxv[i].a_un.a_val);
break;
+#endif
case AT_EXECPATH:
- printf(" AT_EXECPATH=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_EXECPATH, %p, auxv[i].a_un.a_ptr);
break;
case AT_CANARY:
- printf(" AT_CANARY=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_CANARY, %p, auxv[i].a_un.a_ptr);
break;
case AT_CANARYLEN:
- printf(" AT_CANARYLEN=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_CANARYLEN, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_OSRELDATE:
- printf(" AT_OSRELDATE=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_OSRELDATE, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_NCPUS:
- printf(" AT_NCPUS=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_NCPUS, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_PAGESIZES:
- printf(" AT_PAGESIZES=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_PAGESIZES, %p, auxv[i].a_un.a_ptr);
break;
case AT_PAGESIZESLEN:
- printf(" AT_PAGESIZESLEN=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_PAGESIZESLEN, %ld, (long)auxv[i].a_un.a_val);
break;
case AT_STACKPROT:
- printf(" AT_STACKPROT=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ if ((auxv[i].a_un.a_val & VM_PROT_EXECUTE) != 0)
+ PRINT(AT_STACKPROT, %s, "NONEXECUTABLE");
+ else
+ PRINT(AT_STACKPROT, %s, "EXECUTABLE");
break;
case AT_COUNT:
- printf(" AT_COUNT=0x%lu",
- (unsigned long)aux->a_un.a_val);
+ PRINT(AT_COUNT, %ld, (long)auxv[i].a_un.a_val);
break;
default:
- printf(" %ld=0x%lu", (long)aux->a_type,
- (unsigned long)aux->a_un.a_val);
+ PRINT_UNKNOWN(auxv[i].a_type, auxv[i].a_un.a_val);
break;
}
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
