From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:19:46 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 5838B16A484; Tue, 13 Jun 2006 01:19:46 +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 353C516A481 for ; Tue, 13 Jun 2006 01:19:46 +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 4642443D46 for ; Tue, 13 Jun 2006 01:19:45 +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 k5D1HSXs055449 for ; Tue, 13 Jun 2006 01:17:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D1HSSQ055446 for perforce@freebsd.org; Tue, 13 Jun 2006 01:17:28 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 01:17:28 GMT Message-Id: <200606130117.k5D1HSSQ055446@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 99109 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, 13 Jun 2006 01:19:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=99109 Change 99109 by jb@jb_freebsd2 on 2006/06/13 01:17:01 Remove printfs which cause fbt to double fault. Anyone for tennis? Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#5 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#10 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#16 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#5 (text+ko) ==== @@ -58,7 +58,6 @@ c[i++] = ')'; c[i] = '\0'; -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD debug_enter(c); #endif @@ -104,7 +103,6 @@ return; } -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD /* * raise() has a queue depth of 1 -- we ignore all subsequent @@ -124,7 +122,6 @@ if (dtrace_destructive_disallow) return; -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD if (!curthread->t_dtrace_stop) { curthread->t_dtrace_stop = 1; @@ -187,7 +184,6 @@ dtrace_action_ustack(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t *buf, uint64_t arg) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD int nframes = DTRACE_USTACK_NFRAMES(arg); int strsize = DTRACE_USTACK_STRSIZE(arg); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#10 (text+ko) ==== @@ -51,7 +51,6 @@ return (mstate->dtms_arg[ndx]); case DIF_VAR_UREGS: { -printf("%s:%s(%d): DIF_VAR_UREGS\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD klwp_t *lwp; @@ -352,7 +351,6 @@ break; case DIF_SUBR_MUTEX_OWNED: -printf("%s:%s(%d): DIF_SUBR_MUTEX_OWNED\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi)) @@ -363,7 +361,6 @@ break; case DIF_SUBR_MUTEX_OWNER: -printf("%s:%s(%d): DIF_SUBR_MUTEX_OWNER\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi) && @@ -375,7 +372,6 @@ break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: -printf("%s:%s(%d): DIF_SUBR_MUTEX_TYPE_ADAPTIVE\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_ADAPTIVE(&m.mi); @@ -383,7 +379,6 @@ break; case DIF_SUBR_MUTEX_TYPE_SPIN: -printf("%s:%s(%d): DIF_SUBR_MUTEX_TYPE_SPIN\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_SPIN(&m.mi); @@ -391,7 +386,6 @@ break; case DIF_SUBR_RW_READ_HELD: { -printf("%s:%s(%d): DIF_SUBR_RW_READ_HELD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD uintptr_t tmp; @@ -402,7 +396,6 @@ } case DIF_SUBR_RW_WRITE_HELD: -printf("%s:%s(%d): DIF_SUBR_RW_WRITE_HELD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_WRITE_HELD(&r.ri); @@ -410,7 +403,6 @@ break; case DIF_SUBR_RW_ISWRITER: -printf("%s:%s(%d): DIF_SUBR_RW_ISWRITER\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_ISWRITER(&r.ri); @@ -518,7 +510,6 @@ case DIF_SUBR_MSGSIZE: case DIF_SUBR_MSGDSIZE: { -printf("%s:%s(%d): DIF_SUBR_MSGSIZE or DIF_SUBR_MSGDSIZE\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD uintptr_t baddr = tupregs[0].dttk_value, daddr; uintptr_t wptr, rptr; @@ -943,7 +934,6 @@ } case DIF_SUBR_GETMAJOR: -printf("%s:%s(%d): DIF_SUBR_GETMAJOR\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD #ifdef _LP64 regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR64) & MAXMAJ64; @@ -954,7 +944,6 @@ break; case DIF_SUBR_GETMINOR: -printf("%s:%s(%d): DIF_SUBR_GETMINOR\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD #ifdef _LP64 regs[rd] = tupregs[0].dttk_value & MAXMIN64; @@ -965,7 +954,6 @@ break; case DIF_SUBR_DDI_PATHNAME: { -printf("%s:%s(%d): DIF_SUBR_DDI_PATHNAME\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD /* * This one is a galactic mess. We are going to roughly ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#16 (text+ko) ==== @@ -27,12 +27,10 @@ void dtrace_vtime_enable(void) { - printf("%s:\n",__FUNCTION__); } void dtrace_vtime_disable(void) { - printf("%s:\n",__FUNCTION__); } void dtrace_vpanic(const char *fmt, __va_list args) @@ -43,7 +41,6 @@ int dtrace_getipl(void) { - printf("%s:\n",__FUNCTION__); return 0; } boolean_t @@ -79,13 +76,14 @@ (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) { - printf("%s:\n",__FUNCTION__); return 0; } int