From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:26:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B47E816A469; Sun, 30 Dec 2007 07:26:30 +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 79D4516A419 for ; Sun, 30 Dec 2007 07:26:30 +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 68C3913C458 for ; Sun, 30 Dec 2007 07:26:30 +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 lBU7QUjl098806 for ; Sun, 30 Dec 2007 07:26:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7QTkx098803 for perforce@freebsd.org; Sun, 30 Dec 2007 07:26:29 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:26:29 GMT Message-Id: <200712300726.lBU7QTkx098803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2007 07:26:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=132079 Change 132079 by jb@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 }