PERFORCE change 96129 for review

[John Birrell]

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

Change 96129 by jb at jb_freebsd2 on 2006/04/26 04:30:02

	I said: Run Spot, run! And he did. We got a probe!

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#4 edit

Differences ...

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

@@ -97,7 +97,6 @@
 		*flags &= ~CPU_DTRACE_ERROR;
 
 		if (prov == dtrace_provider) {
-printf("%s(%d): dtrace is the provider\n",__FUNCTION__,__LINE__);
 			/*
 			 * If dtrace itself is the provider of this probe,
 			 * we're only going to continue processing the ECB if
@@ -130,11 +129,9 @@
 				    DTRACE_ACTIVITY_DRAINING);
 				continue;
 			}
-if (probe->dtpr_id == dtrace_probeid_begin) printf("%s(%d): This is the BEGIN probe!\n",__FUNCTION__,__LINE__);
 		}
 
 		if (ecb->dte_cond) {
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 			/*
 			 * If the dte_cond bits indicate that this
 			 * consumer is only allowed to see user-mode firings
@@ -207,7 +204,6 @@
 			 * the KILLED state, from which no further processing
 			 * on this state will be performed.
 			 */
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 			if (!dtrace_priv_kernel_destructive(state) ||
 			    !state->dts_cred.dcr_destructive ||
 			    dtrace_destructive_disallow) {
@@ -242,7 +238,6 @@
 
 			rval = dtrace_dif_emulate(dp, &mstate, vstate, state);
 
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 			if (!(*flags & CPU_DTRACE_ERROR) && !rval) {
 				dtrace_cacheid_t cid = probe->dtpr_predcache;
 
@@ -267,14 +262,12 @@
 			size = rec->dtrd_size;
 			valoffs = offs + rec->dtrd_offset;
 
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 			if (DTRACEACT_ISAGG(act->dta_kind)) {
 				uint64_t v = 0xbad;
 				dtrace_aggregation_t *agg;
 
 				agg = (dtrace_aggregation_t *)act;
 
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if ((dp = act->dta_difo) != NULL)
 					v = dtrace_dif_emulate(dp,
 					    &mstate, vstate, state);
@@ -295,28 +288,23 @@
 				continue;
 			}
 
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 			switch (act->dta_kind) {
 			case DTRACEACT_STOP:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (dtrace_priv_proc_destructive(state))
 					dtrace_action_stop();
 				continue;
 
 			case DTRACEACT_BREAKPOINT:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (dtrace_priv_kernel_destructive(state))
 					dtrace_action_breakpoint(ecb);
 				continue;
 
 			case DTRACEACT_PANIC:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (dtrace_priv_kernel_destructive(state))
 					dtrace_action_panic(ecb);
 				continue;
 
 			case DTRACEACT_STACK:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (!dtrace_priv_kernel(state))
 					continue;
 
@@ -329,14 +317,12 @@
 
 			case DTRACEACT_JSTACK:
 			case DTRACEACT_USTACK:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (!dtrace_priv_proc(state))
 					continue;
 
 				/*
 				 * See comment in DIF_VAR_PID.
 				 */
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 #ifdef DOODAD
 				if (DTRACE_ANCHORED(mstate.dtms_probe) &&
 				    CPU_ON_INTR(CPU)) {
@@ -366,7 +352,6 @@
 					continue;
 				}
 
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 				dtrace_getupcstack((uint64_t *)
 				    (tomax + valoffs),
@@ -375,7 +360,6 @@
 				continue;
 
 			default:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				break;
 			}
 
@@ -389,7 +373,6 @@
 
 			switch (act->dta_kind) {
 			case DTRACEACT_SPECULATE:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				ASSERT(buf == &state->dts_buffer[cpuid]);
 				buf = dtrace_speculation_buffer(state,
 				    cpuid, val);
@@ -417,19 +400,16 @@
 				continue;
 
 			case DTRACEACT_CHILL:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (dtrace_priv_kernel_destructive(state))
 					dtrace_action_chill(&mstate, val);
 				continue;
 
 			case DTRACEACT_RAISE:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (dtrace_priv_proc_destructive(state))
 					dtrace_action_raise(val);
 				continue;
 
 			case DTRACEACT_COMMIT:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				ASSERT(!committed);
 
 				/*
@@ -443,7 +423,6 @@
 				continue;
 
 			case DTRACEACT_DISCARD:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				dtrace_speculation_discard(state, cpuid, val);
 				continue;
 
@@ -453,12 +432,10 @@
 			case DTRACEACT_PRINTA:
 			case DTRACEACT_SYSTEM:
 			case DTRACEACT_FREOPEN:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				break;
 
 			case DTRACEACT_SYM:
 			case DTRACEACT_MOD:
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				if (!dtrace_priv_kernel(state))
 					continue;
 				break;
@@ -478,7 +455,6 @@
 				    valoffs + sizeof (uint64_t), val);
 
 #endif
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				continue;
 			}
 
@@ -499,7 +475,6 @@
 				 * thread in COOLDOWN, so there is no race.)
 				 */
 				void *activity = &state->dts_activity;
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 				dtrace_activity_t current = state->dts_activity;
 
 				if (current == DTRACE_ACTIVITY_COOLDOWN)
@@ -521,7 +496,6 @@
 				ASSERT(0);
 			}
 
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 			if (dp->dtdo_rtype.dtdt_flags & DIF_TF_BYREF) {
 				uintptr_t end = valoffs + size;
 
@@ -590,7 +564,6 @@
 		if (*flags & CPU_DTRACE_FAULT) {
 			int ndx;
 			dtrace_action_t *err;
-printf("%s(%d): \n",__FUNCTION__,__LINE__);
 
 			buf->dtb_errors++;