From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 04:52:51 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 620B3123A; Mon,  8 Sep 2014 04:52:51 +0000 (UTC)
Delivered-To: perforce@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 1D0CD9E8
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:51:22 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682: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 F3E0D1ECE
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:51:21 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pL5q027259
 for <perforce@freebsd.org>; Mon, 8 Sep 2014 04:51:21 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pLh6027256
 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:21 GMT
 (envelope-from jhb@freebsd.org)
Date: Mon, 8 Sep 2014 04:51:21 GMT
Message-Id: <201409080451.s884pLh6027256@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1199530 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Sep 2014 04:52:51 -0000

http://p4web.freebsd.org/@@1199530?ac=10

Change 1199530 by jhb@jhb_pippin on 2014/08/29 16:53:45

	Fix ki_stamp for threads.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_proc.c#137 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_proc.c#137 (text+ko) ====

@@ -785,12 +785,12 @@
 static void
 fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
 {
+	struct timeval uptime;
 	struct thread *td0;
 	struct tty *tp;
 	struct session *sp;
 	struct ucred *cred;
 	struct sigacts *ps;
-	struct timeval uptime;
 
 	/* For proc_realparent. */
 	sx_assert(&proctree_lock, SX_LOCKED);
@@ -873,10 +873,10 @@
 	kp->ki_fibnum = p->p_fibnum;
 	kp->ki_start = p->p_stats->p_start;
 	timevaladd(&kp->ki_start, &boottime);
+	PROC_SLOCK(p);
 	microuptime(&uptime);
 	/* Wrapping is ok as this is only used to compute deltas. */
 	kp->ki_stamp = uptime.tv_sec * 1000000 + uptime.tv_usec;
-	PROC_SLOCK(p);
 	rufetch(p, &kp->ki_rusage);
 	kp->ki_runtime = cputick2usec(p->p_rux.rux_runtime);
 	calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime);
@@ -940,6 +940,7 @@
 static void
 fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread)
 {
+	struct timeval uptime;
 	struct proc *p;
 
 	p = td->td_proc;
@@ -999,6 +1000,9 @@
 	kp->ki_pri.pri_user = td->td_user_pri;
 
 	if (preferthread) {
+		microuptime(&uptime);
+		/* Wrapping is ok as this is only used to compute deltas. */
+		kp->ki_stamp = uptime.tv_sec * 1000000 + uptime.tv_usec;
 		rufetchtd(td, &kp->ki_rusage);
 		kp->ki_runtime = cputick2usec(td->td_rux.rux_runtime);
 		kp->ki_pctcpu = sched_pctcpu(td);