PERFORCE change 131200 for review
John Birrell
jb at FreeBSD.org
Tue Dec 18 19:10:12 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131200
Change 131200 by jb at jb_freebsd1 on 2007/12/19 03:09:14
Update to reflect the latest DTrace hooks strategy and the
realisation that the cyclic timer subsystem will never come
out of the CDDL cold.
Affected files ...
.. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#14 edit
Differences ...
==== //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#14 (text+ko) ====
@@ -35,8 +35,8 @@
__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.44 2007/09/11 22:54:09 attilio Exp $");
#include "opt_hwpmc_hooks.h"
+#include "opt_kdtrace.h"
-#include "opt_cyclic.h"
#include "opt_ddb.h"
#include <sys/param.h>
@@ -66,7 +66,10 @@
#include <ddb/ddb.h>
#endif
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
cyclic_clock_func_t lapic_cyclic_clock_func;
+#endif
/* Sanity checks on IDT vectors. */
CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT);
@@ -682,8 +685,9 @@
else
hardclock_cpu(TRAPF_USERMODE(frame));
+#ifdef KDTRACE_HOOKS
/*
- * If the cyclic subsystem is configured and a callback
+ * If the DTrace hooks are configured and a callback
* function has been registered, then call it to process
* the high speed timers. If this function is registered
* here, then there mustn't be a High Performance Event
@@ -692,6 +696,7 @@
*/
if (lapic_cyclic_clock_func != NULL)
(*lapic_cyclic_clock_func)();
+#endif
}
/* Fire statclock at stathz. */
More information about the p4-projects
mailing list