From owner-p4-projects@FreeBSD.ORG  Mon Mar 13 16:15:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A2B0D16A443; Mon, 13 Mar 2006 16:15:18 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9C3D116A422
	for <perforce@freebsd.org>; Mon, 13 Mar 2006 16:15:09 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8950B43D58
	for <perforce@freebsd.org>; Mon, 13 Mar 2006 16:15:05 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2DGF5al029082
	for <perforce@freebsd.org>; Mon, 13 Mar 2006 16:15:05 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2DGF5Pu029078
	for perforce@freebsd.org; Mon, 13 Mar 2006 16:15:05 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 13 Mar 2006 16:15:05 GMT
Message-Id: <200603131615.k2DGF5Pu029078@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93252 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 13 Mar 2006 16:15:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=93252

Change 93252 by jhb@jhb_slimer on 2006/03/13 16:14:33

	Drop these local diffs now that phk has committed something
	similar to HEAD.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_resource.c#60 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_resource.c#60 (text+ko) ====

@@ -761,19 +761,14 @@
 	ut = ruxp->rux_uticks;
 	st = ruxp->rux_sticks;
 	it = ruxp->rux_iticks;
+	tu = ruxp->rux_runtime;
+	tu = cputick2usec(tu);
 	tt = ut + st + it;
 	if (tt == 0) {
 		st = 1;
 		tt = 1;
 	}
-	tu = cputick2usec(ruxp->rux_runtime);
 	ptu = ruxp->rux_uu + ruxp->rux_su + ruxp->rux_iu;
-	if (tu < ptu) {
-		printf(
-"calcru: runtime went backwards from %ju usec to %ju usec for pid %d (%s)\n",
-		    (uintmax_t)ptu, (uintmax_t)tu, p->p_pid, p->p_comm);
-		tu = ptu;
-	}
 	if ((int64_t)tu < 0) {
 		printf("calcru: negative runtime of %jd usec for pid %d (%s)\n",
 		    (intmax_t)tu, p->p_pid, p->p_comm);
@@ -784,6 +779,16 @@
 	uu = (tu * ut) / tt;
 	su = (tu * st) / tt;
 	iu = tu - uu - su;
+	if (tu < ptu) {
+		printf(
+"calcru: runtime went backwards from %ju usec to %ju usec for pid %d (%s)\n",
+		    (uintmax_t)ptu, (uintmax_t)tu, p->p_pid, p->p_comm);
+		printf("u %ju:%ju/%ju s %ju:%ju/%ju i %ju:%ju/%ju\n",
+		    (uintmax_t)ut, (uintmax_t)ruxp->rux_uu, uu,
+		    (uintmax_t)st, (uintmax_t)ruxp->rux_su, su,
+		    (uintmax_t)it, (uintmax_t)ruxp->rux_iu, iu);
+		tu = ptu;
+	}
 #if 0
 	/* Enforce monotonicity. */
 	if (uu < ruxp->rux_uu || su < ruxp->rux_su || iu < ruxp->rux_iu) {