From owner-p4-projects@FreeBSD.ORG  Wed Jan 30 04:48:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6845C16A468; Wed, 30 Jan 2008 04:48:37 +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 2E48216A419
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 04:48:37 +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 157A813C461
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 04:48:37 +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 m0U4maM6082611
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 04:48:36 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U4maYA082608
	for perforce@freebsd.org; Wed, 30 Jan 2008 04:48:36 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 30 Jan 2008 04:48:36 GMT
Message-Id: <200801300448.m0U4maYA082608@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 134436 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: Wed, 30 Jan 2008 04:48:37 -0000

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

Change 134436 by jb@jb_freebsd1 on 2008/01/30 04:47:37

	IFdtrace

Affected files ...

.. //depot/projects/dtrace7/src/sys/amd64/amd64/tsc.c#2 edit

Differences ...

==== //depot/projects/dtrace7/src/sys/amd64/amd64/tsc.c#2 (text+ko) ====

@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $");
 
 #include "opt_clock.h"
+#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -44,6 +45,10 @@
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
+#endif
+
 #include "cpufreq_if.h"
 
 uint64_t	tsc_freq;
@@ -220,3 +225,18 @@
 {
 	return (rdtsc());
 }
+
+#ifdef KDTRACE_HOOKS
+/*
+ * DTrace needs a high resolution time function which can
+ * be called from a probe context and guaranteed not to have
+ * instrumented with probes itself.
+ *
+ * Returns nanoseconds since boot.
+ */
+uint64_t
+dtrace_gethrtime()
+{
+	return (rdtsc() * (uint64_t) 1000000000 / tsc_freq);
+}
+#endif