From owner-p4-projects@FreeBSD.ORG Fri Jul 7 19:08:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC7CC16A4DF; Fri, 7 Jul 2006 19:08:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D3DC16A4DD for ; Fri, 7 Jul 2006 19:08:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 371AC43D53 for ; Fri, 7 Jul 2006 19:08:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k67J8IWi062739 for ; Fri, 7 Jul 2006 19:08:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67J8IpE062736 for perforce@freebsd.org; Fri, 7 Jul 2006 19:08:18 GMT (envelope-from jb@freebsd.org) Date: Fri, 7 Jul 2006 19:08:18 GMT Message-Id: <200607071908.k67J8IpE062736@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 100927 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: Fri, 07 Jul 2006 19:08:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100927 Change 100927 by jb@jb_freebsd2 on 2006/07/07 19:07:36 Move some hack functions into the i386 specific file to avoid clashing with the sparc64 ones. These aren't hacks -- they are just incomplete. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#18 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#18 (text+ko) ==== @@ -18,61 +18,16 @@ dtrace_speculation_clean }; void -dtrace_sync(void) -{ -#ifdef DOODAD - dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_sync_func, NULL); -#endif -} -void dtrace_vpanic(const char *fmt, __va_list args) { kdb_backtrace(); vprintf(fmt,args); } -int -dtrace_getipl(void) -{ - return 0; -} boolean_t priv_policy_only(const cred_t *a, int b, boolean_t c) { return 0; } -#ifdef DOODAD -static int -dtrace_xcall_func(dtrace_xcall_t func, void *arg) -{ - (*func)(arg); - - return (0); -} -#endif -void -dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg) -{ -#ifdef DOODAD - cpuset_t set; - - CPUSET_ZERO(set); - - if (cpu == DTRACE_CPUALL) { - CPUSET_ALL(set); - } else { - CPUSET_ADD(set, cpu); - } - - kpreempt_disable(); - xc_sync((xc_arg_t)func, (xc_arg_t)arg, 0, X_CALL_HIPRI, set, - (xc_func_t)dtrace_xcall_func); - kpreempt_enable(); -#else - critical_enter(); - (*func)(arg); - critical_exit(); -#endif -} taskqid_t taskq_dispatch(taskq_t *a, task_func_t b, void *c, uint_t d) { ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 (text+ko) ==== @@ -134,13 +134,15 @@ dtrace_invop_func = NULL; } -#ifdef DOODAD int dtrace_getipl(void) { +#ifdef DOODAD return (CPU->cpu_pri); +#else + return (0); +#endif } -#endif /*ARGSUSED*/ void @@ -171,11 +173,11 @@ return (0); } - -/*ARGSUSED*/ +#endif void dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg) { +#ifdef DOODAD cpuset_t set; CPUSET_ZERO(set); @@ -190,18 +192,28 @@ xc_sync((xc_arg_t)func, (xc_arg_t)arg, 0, X_CALL_HIPRI, set, (xc_func_t)dtrace_xcall_func); kpreempt_enable(); +#else + critical_enter(); + (*func)(arg); + critical_exit(); +#endif } +#ifdef DOODAD void dtrace_sync_func(void) {} +#endif void dtrace_sync(void) { - dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_sync_func, NULL); +#ifdef DOODAD + dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_sync_func, NULL); +#endif } +#ifdef DOODAD int (*dtrace_fasttrap_probe_ptr)(struct regs *); int (*dtrace_pid_probe_ptr)(struct regs *); int (*dtrace_return_probe_ptr)(struct regs *);