From owner-p4-projects@FreeBSD.ORG Tue Jan 1 09:06:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 977B416A521; Tue, 1 Jan 2008 09:06:43 +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 13E1416A417 for ; Tue, 1 Jan 2008 09:06:43 +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 047F413C465 for ; Tue, 1 Jan 2008 09:06:43 +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 m0196g8P086605 for ; Tue, 1 Jan 2008 09:06:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0196grI086602 for perforce@freebsd.org; Tue, 1 Jan 2008 09:06:42 GMT (envelope-from jb@freebsd.org) Date: Tue, 1 Jan 2008 09:06:42 GMT Message-Id: <200801010906.m0196grI086602@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 132239 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: Tue, 01 Jan 2008 09:06:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=132239 Change 132239 by jb@jb_freebsd1 on 2008/01/01 09:06:34 Add the trap function to the hook on loading and NULL when unloading. Re-order some locks. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#22 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#19 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#22 (text+ko) ==== @@ -27,10 +27,8 @@ { dtrace_provider_id_t id; -#if defined(__i386__) - /* Hang our hook for DTrace traps during probes. */ - dtrace_instr_size_func = dtrace_instr_size; -#endif + /* Hook into the trap handler. */ + dtrace_trap_func = dtrace_trap; #ifdef DOODAD /* Hang our hook for thread switches. */ @@ -56,9 +54,9 @@ mutex_init(&dtrace_meta_lock,"dtrace meta-provider state", MUTEX_DEFAULT, NULL); mutex_init(&dtrace_errlock,"dtrace error lock", MUTEX_DEFAULT, NULL); - mutex_enter(&cpu_lock); mutex_enter(&dtrace_provider_lock); mutex_enter(&dtrace_lock); + mutex_enter(&cpu_lock); #ifdef DOODAD dtrace_modload = dtrace_module_loaded; ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#19 (text+ko) ==== @@ -41,23 +41,23 @@ clone_cleanup(&dtrace_clones); } - mutex_enter(&cpu_lock); mutex_enter(&dtrace_provider_lock); mutex_enter(&dtrace_lock); + mutex_enter(&cpu_lock); ASSERT(dtrace_opens == 0); if (dtrace_helpers > 0) { + mutex_exit(&cpu_lock); + mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); - mutex_exit(&dtrace_lock); - mutex_exit(&cpu_lock); return (EBUSY); } if (dtrace_unregister((dtrace_provider_id_t)dtrace_provider) != 0) { + mutex_exit(&cpu_lock); + mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); - mutex_exit(&dtrace_lock); - mutex_exit(&cpu_lock); return (EBUSY); } @@ -168,10 +168,8 @@ dtrace_vtime_switch_func = NULL; #endif -#if defined(__i386__) - /* Reset our hook for DTrace traps during probes. */ - dtrace_instr_size_func = NULL; -#endif + /* Unhook from the trap handler. */ + dtrace_trap_func = NULL; return (error); }