From owner-p4-projects@FreeBSD.ORG  Sat Jan  5 04:42:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DFF916A420; Sat,  5 Jan 2008 04:42:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DECA716A480
	for <perforce@freebsd.org>; Sat,  5 Jan 2008 04:42:48 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CD3DA13C43E
	for <perforce@freebsd.org>; Sat,  5 Jan 2008 04:42:48 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m054gmxl005722
	for <perforce@freebsd.org>; Sat, 5 Jan 2008 04:42:48 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m054gmTh005719
	for perforce@freebsd.org; Sat, 5 Jan 2008 04:42:48 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 5 Jan 2008 04:42:48 GMT
Message-Id: <200801050442.m054gmTh005719@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132545 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: Sat, 05 Jan 2008 04:42:51 -0000

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

Change 132545 by jb@jb_freebsd1 on 2008/01/05 04:42:27

	Use a time function based on the TSC, not the per-CPU cycle counter.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#6 (text+ko) ====

@@ -200,7 +200,7 @@
 	hrtime_t late;
 	solaris_cpu_t *c = &solaris_cpu[curcpu];
 
-	late = dtrace_gethrtime() - pcpu->profc_expected;
+	late = gethrtime() - pcpu->profc_expected;
 	pcpu->profc_expected += pcpu->profc_interval;
 
 	dtrace_probe(prof->prof_id, c->cpu_profile_pc,
@@ -403,7 +403,7 @@
 	hdlr->cyh_arg = pcpu;
 
 	when->cyt_interval = prof->prof_interval;
-	when->cyt_when = dtrace_gethrtime() + when->cyt_interval;
+	when->cyt_when = gethrtime() + when->cyt_interval;
 
 	pcpu->profc_expected = when->cyt_when;
 	pcpu->profc_interval = when->cyt_interval;
@@ -436,7 +436,7 @@
 		hdlr.cyh_arg = prof;
 
 		when.cyt_interval = prof->prof_interval;
-		when.cyt_when = dtrace_gethrtime() + when.cyt_interval;
+		when.cyt_when = gethrtime() + when.cyt_interval;
 	} else {
 		ASSERT(prof->prof_kind == PROF_PROFILE);
 		omni.cyo_online = profile_online;