Author: pluknet
Date: Thu Jun 26 10:09:37 2014
New Revision: 267907
URL: http://svnweb.freebsd.org/changeset/base/267907
Log:
MFC r254943 (by will, partially):
Add the ability to display the default FIB number for a process to the
ps(1) utility, e.g. "ps -O fib".
The rest was previously (mis-)merged with r260208.
Modified:
stable/9/bin/ps/keyword.c
stable/9/bin/ps/ps.1
stable/9/sys/kern/kern_proc.c
Directory Properties:
stable/9/bin/ps/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/bin/ps/keyword.c
==============================================================================
--- stable/9/bin/ps/keyword.c Thu Jun 26 09:42:00 2014 (r267906)
+++ stable/9/bin/ps/keyword.c Thu Jun 26 10:09:37 2014 (r267907)
@@ -87,6 +87,7 @@ static VAR var[] = {
{"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0},
{"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0},
{"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0},
+ {"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
{"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0},
{"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
{"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0},
Modified: stable/9/bin/ps/ps.1
==============================================================================
--- stable/9/bin/ps/ps.1 Thu Jun 26 09:42:00 2014 (r267906)
+++ stable/9/bin/ps/ps.1 Thu Jun 26 10:09:37 2014 (r267907)
@@ -523,6 +523,9 @@ elapsed running time, format
minutes:seconds.
.It Cm etimes
elapsed running time, in decimal integer seconds
+.It Cm fib
+default FIB number, see
+.Xr setfib 1
.It Cm flags
the process flags, in hexadecimal (alias
.Cm f )
Modified: stable/9/sys/kern/kern_proc.c
==============================================================================
--- stable/9/sys/kern/kern_proc.c Thu Jun 26 09:42:00 2014
(r267906)
+++ stable/9/sys/kern/kern_proc.c Thu Jun 26 10:09:37 2014
(r267907)
@@ -864,6 +864,7 @@ fill_kinfo_proc_only(struct proc *p, str
kp->ki_swtime = (ticks - p->p_swtick) / hz;
kp->ki_pid = p->p_pid;
kp->ki_nice = p->p_nice;
+ kp->ki_fibnum = p->p_fibnum;
kp->ki_start = p->p_stats->p_start;
timevaladd(&kp->ki_start, &boottime);
PROC_SLOCK(p);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
