svn commit: r268108 - in stable: 10/usr.bin/procstat 9/usr.bin/procstat

[John Baldwin]

Author: jhb
Date: Tue Jul  1 18:23:00 2014
New Revision: 268108
URL: http://svnweb.freebsd.org/changeset/base/268108

Log:
  MFC 266322,266323:
  - Use 'RESOURCE' instead of the more generic 'TYPE' for the resource name
    column header when displaying resource usage.  This more closely matches
    other procstat displays.
  - Add descriptions of the display formats for -e, -l, -r, and -x.  Fix a few
    typos in indent settings while here.

Modified:
  stable/9/usr.bin/procstat/procstat.1
  stable/9/usr.bin/procstat/procstat_rusage.c
Directory Properties:
  stable/9/usr.bin/procstat/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/usr.bin/procstat/procstat.1
  stable/10/usr.bin/procstat/procstat_rusage.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/usr.bin/procstat/procstat.1
==============================================================================
--- stable/9/usr.bin/procstat/procstat.1	Tue Jul  1 18:05:38 2014	(r268107)
+++ stable/9/usr.bin/procstat/procstat.1	Tue Jul  1 18:23:00 2014	(r268108)
@@ -135,6 +135,17 @@ command
 .It ARGS
 command line arguments (if available)
 .El
+.Ss Environment Variables
+Display the process ID, command, and environment variables:
+.Pp
+.Bl -tag -width "ENVIRONMENT" -compact
+.It PID
+process ID
+.It COMM
+command
+.It ENVIRONMENT
+environment variables (if available)
+.El
 .Ss File Descriptors
 Display detailed information about each file descriptor referenced by a
 process, including the process ID, command, file descriptor number, and
@@ -246,7 +257,7 @@ present for each capability descriptor.
 .Ss Signal Disposition Information
 Display signal pending and disposition for a process:
 .Pp
-.Bl -tag -width ident -compact
+.Bl -tag -width indent -compact
 .It PID
 process ID
 .It COMM
@@ -271,7 +282,7 @@ switch is given, the signal numbers are 
 .Ss Thread Signal Information
 Display signal pending and blocked for a process's threads:
 .Pp
-.Bl -tag -width ident -compact
+.Bl -tag -width indent -compact
 .It PID
 process ID
 .It TID
@@ -320,6 +331,45 @@ thread name
 .It KSTACK
 kernel thread call stack
 .El
+.Ss Resource Limits
+Display resource limits for a process:
+.Pp
+.Bl -tag -width indent -compact
+.It PID
+process ID
+.It COMM
+command
+.It RLIMIT
+resource limit name
+.It SOFT
+soft limit
+.It HARD
+hard limit
+.El
+.Ss Resource Usage
+Display resource usage for a process.
+If the
+.Fl H
+flag is specified,
+resource usage for individual threads is displayed instead.
+.Pp
+.Bl -tag -width "RESOURCE" -compact
+.It PID
+process ID
+.It TID
+thread ID
+.Po
+if
+.Fl H
+is specified
+.Pc
+.It COMM
+command
+.It RESOURCE
+resource name
+.It VALUE
+current usage
+.El
 .Ss Security Credentials
 Display process credential information:
 .Pp
@@ -452,6 +502,19 @@ grows down (top-down stack)
 .It U
 grows up (bottom-up stack)
 .El
+.Ss ELF Auxiliary Vector
+Display ELF auxiliary vector values:
+.Pp
+.Bl -tag -width indent -compact
+.It PID
+process ID
+.It COMM
+command
+.It AUXV
+auxiliary vector name
+.It VALUE
+auxiliary vector value
+.El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO

Modified: stable/9/usr.bin/procstat/procstat_rusage.c
==============================================================================
--- stable/9/usr.bin/procstat/procstat_rusage.c	Tue Jul  1 18:05:38 2014	(r268107)
+++ stable/9/usr.bin/procstat/procstat_rusage.c	Tue Jul  1 18:23:00 2014	(r268108)
@@ -141,7 +141,8 @@ procstat_rusage(struct procstat *procsta
 		printf("%5s ", "PID");
 		if (Hflag)
 			printf("%6s ", "TID");
-		printf("%-16s %-32s %14s\n", "COMM", "TYPE", "VALUE        ");
+		printf("%-16s %-32s %14s\n", "COMM", "RESOURCE",
+		    "VALUE        ");
 	}
 
 	if (!Hflag) {