PERFORCE change 138300 for review
John Birrell
jb at FreeBSD.org
Sat Mar 22 18:21:58 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=138300
Change 138300 by jb at jb_freebsd1 on 2008/03/22 18:21:39
Move the dtrace_gethrtime() functions back into DTrace central.
These need to be expanded to be multi-cpu aware so that the time
value takes into account skew between processes.
Affected files ...
.. //depot/projects/dtrace/src/sys/amd64/amd64/tsc.c#6 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#9 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#12 edit
.. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#12 edit
Differences ...
==== //depot/projects/dtrace/src/sys/amd64/amd64/tsc.c#6 (text+ko) ====
@@ -28,7 +28,6 @@
__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>
@@ -45,10 +44,6 @@
#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;
@@ -225,18 +220,3 @@
{
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
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#9 (text+ko) ====
@@ -377,6 +377,19 @@
}
#endif
+/*
+ * 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);
+}
+
uint64_t
dtrace_gethrestime(void)
{
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#12 (text+ko) ====
@@ -376,6 +376,19 @@
}
#endif
+/*
+ * 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);
+}
+
uint64_t
dtrace_gethrestime(void)
{
==== //depot/projects/dtrace/src/sys/i386/i386/tsc.c#12 (text+ko) ====
@@ -28,7 +28,6 @@
__FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.208 2007/06/04 18:25:06 dwmalone Exp $");
#include "opt_clock.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/bus.h>
@@ -45,10 +44,6 @@
#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;
@@ -249,18 +244,3 @@
{
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
More information about the p4-projects
mailing list