PERFORCE change 132079 for review
John Birrell
jb at FreeBSD.org
Sat Dec 29 23:26:31 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=132079
Change 132079 by jb at jb_freebsd1 on 2007/12/30 07:25:38
Hacks to get this sucker to compile, link and load without killing
my amd64 development box.
Affected files ...
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#19 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#17 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#15 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#2 edit
Differences ...
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#19 (text+ko) ====
@@ -2,39 +2,11 @@
dtrace_cacheid_t dtrace_predcache_id;
-void *hack_refs[] =
- {
- dtrace_cpu_setup_initial,
- dtrace_getustack_common,
- dtrace_helper,
- dtrace_helper_slurp,
- dtrace_helpers_destroy,
- dtrace_helpers_duplicate,
- dtrace_inscratch,
- dtrace_module_loaded,
- dtrace_module_unloaded,
- dtrace_priv_proc_control,
- dtrace_speculation,
- dtrace_speculation_clean
- };
-void
-dtrace_vpanic(const char *fmt, __va_list args)
-{
- kdb_backtrace();
- vprintf(fmt,args);
-}
+int panic_quiesce;
+char panic_stack[PANICSTKSIZE];
+
boolean_t
priv_policy_only(const cred_t *a, int b, boolean_t c)
{
return 0;
}
-taskqid_t
-taskq_dispatch(taskq_t *a, task_func_t b, void *c, uint_t d)
-{
- return 0;
-}
-int
-kdi_dtrace_set(kdi_dtrace_set_t a)
-{
- return 0;
-}
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#17 (text+ko) ====
@@ -32,8 +32,10 @@
dtrace_instr_size_func = dtrace_instr_size;
#endif
+#ifdef DOODAD
/* Hang our hook for thread switches. */
dtrace_vtime_switch_func = dtrace_vtime_switch;
+#endif
/*
* XXX This is a short term hack to avoid having to comment
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#15 (text+ko) ====
@@ -159,8 +159,10 @@
* Reset our hook for thread switches, but ensure that vtime isn't
* active first.
*/
+#ifdef DOODAD
dtrace_vtime_active = 0;
dtrace_vtime_switch_func = NULL;
+#endif
#if defined(__i386__)
/* Reset our hook for DTrace traps during probes. */
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#2 (text+ko) ====
@@ -27,6 +27,7 @@
void
dtrace_vtime_enable(void)
{
+#ifdef DOODAD
dtrace_vtime_state_t state, nstate = 0;
do {
@@ -49,11 +50,13 @@
} while (dtrace_cas32((uint32_t *)&dtrace_vtime_active,
state, nstate) != state);
+#endif
}
void
dtrace_vtime_disable(void)
{
+#ifdef DOODAD
dtrace_vtime_state_t state, nstate = 0;
do {
@@ -76,22 +79,22 @@
} while (dtrace_cas32((uint32_t *)&dtrace_vtime_active,
state, nstate) != state);
+#endif
}
void
dtrace_vtime_switch(kthread_t *next)
{
+#ifdef DOODAD
dtrace_icookie_t cookie;
hrtime_t ts;
-#ifdef DOODAD
if (tnf_tracing_active) {
tnf_thread_switch(next);
if (dtrace_vtime_active == DTRACE_VTIME_INACTIVE_TNF)
return;
}
-#endif
cookie = dtrace_interrupt_disable();
ts = dtrace_gethrtime();
@@ -105,4 +108,5 @@
next->td_dtrace_start = ts;
dtrace_interrupt_enable(cookie);
+#endif
}
More information about the p4-projects
mailing list