PERFORCE change 96347 for review

[John Birrell]

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

Change 96347 by jb at jb_freebsd2 on 2006/04/29 02:13:53

	Register and de-register the instruction size function pointer with
	the trap() handler for kaboom-avoidance during probes.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#11 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#10 edit

Differences ...

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

@@ -35,6 +35,9 @@
 	dtrace_enabling_t *enab;
 	int error = 0;
 
+	/* Hang our hook for DTrace traps during probes. */
+	dtrace_instr_size_func = dtrace_instr_size;
+
 	/*
 	 * XXX This is a short term hack to avoid having to comment
 	 * out lots and lots of lock/unlock calls.
@@ -161,6 +164,8 @@
 	dtrace_probeid_error = dtrace_probe_create((dtrace_provider_id_t)
 	    dtrace_provider, NULL, NULL, "ERROR", 1, NULL);
 
+dtrace_err_verbose = 1;
+
 	dtrace_anon_property();
 	mutex_exit(&cpu_lock);
 

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

@@ -153,5 +153,9 @@
 	dtrace_mutex_destroy(&cpu_lock);
 	dtrace_mutex_destroy(&mod_lock);
 
+	/* Reset our hook for DTrace traps during probes. */
+	dtrace_instr_size_func = NULL;
+
+
 	return (error);
 }