PERFORCE change 138382 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=138382

Change 138382 by jb at jb_freebsd1 on 2008/03/23 20:27:26

	Cleanup.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#30 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#26 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#30 (text+ko) ====

@@ -79,24 +79,8 @@
 	mutex_enter(&dtrace_lock);
 	mutex_enter(&cpu_lock);
 
-#ifdef DOODAD
-	dtrace_helpers_cleanup = dtrace_helpers_destroy;
-	dtrace_helpers_fork = dtrace_helpers_duplicate;
-	dtrace_cpustart_init = dtrace_suspend;
-	dtrace_cpustart_fini = dtrace_resume;
-	dtrace_debugger_init = dtrace_suspend;
-	dtrace_debugger_fini = dtrace_resume;
-	dtrace_kreloc_init = dtrace_suspend;
-	dtrace_kreloc_fini = dtrace_resume;
-
-#endif
 	ASSERT(MUTEX_HELD(&cpu_lock));
 
-#ifdef DOODAD
-	dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri,
-	    1, INT_MAX, 0);
-#endif
-
 	dtrace_arena = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx);
 
 	dtrace_state_cache = kmem_cache_create("dtrace_state_cache",

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#26 (text+ko) ====

@@ -71,34 +71,9 @@
 		 */
 		ASSERT(state->dts_necbs == 0);
 		dtrace_state_destroy(state);
-
-#ifdef DOODAD
-		/*
-		 * If we're being detached with anonymous state, we need to
-		 * indicate to the kernel debugger that DTrace is now inactive.
-		 */
-		(void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE);
-#endif
 	}
 
 	bzero(&dtrace_anon, sizeof (dtrace_anon_t));
-#ifdef DOODAD
-	unregister_cpu_setup_func((cpu_setup_func_t *)dtrace_cpu_setup, NULL);
-#endif
-
-#ifdef DOODAD
-	dtrace_cpu_init = NULL;
-	dtrace_helpers_cleanup = NULL;
-	dtrace_helpers_fork = NULL;
-	dtrace_cpustart_init = NULL;
-	dtrace_cpustart_fini = NULL;
-	dtrace_debugger_init = NULL;
-	dtrace_debugger_fini = NULL;
-	dtrace_kreloc_init = NULL;
-	dtrace_kreloc_fini = NULL;
-	dtrace_modload = NULL;
-	dtrace_modunload = NULL;
-#endif
 
 	mutex_exit(&cpu_lock);
 
@@ -138,19 +113,6 @@
 	mutex_exit(&dtrace_lock);
 	mutex_exit(&dtrace_provider_lock);
 
-	/*
-	 * We don't destroy the task queue until after we have dropped our
-	 * locks (taskq_destroy() may block on running tasks).  To prevent
-	 * attempting to do work after we have effectively detached but before
-	 * the task queue has been destroyed, all tasks dispatched via the
-	 * task queue must check that DTrace is still attached before
-	 * performing any operation.
-	 */
-#ifdef DOODAD
-	taskq_destroy(dtrace_taskq);
-	dtrace_taskq = NULL;
-#endif
-
 	mutex_destroy(&dtrace_meta_lock);
 	mutex_destroy(&dtrace_provider_lock);
 	mutex_destroy(&dtrace_lock);