From owner-svn-src-stable-9@FreeBSD.ORG Thu Jun 26 10:09:38 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5D6C1DE; Thu, 26 Jun 2014 10:09:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8839E260D; Thu, 26 Jun 2014 10:09:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QA9cOF098637; Thu, 26 Jun 2014 10:09:38 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QA9btk098634; Thu, 26 Jun 2014 10:09:37 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201406261009.s5QA9btk098634@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 26 Jun 2014 10:09:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r267907 - in stable/9: bin/ps sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 10:09:38 -0000 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);