From owner-p4-projects@FreeBSD.ORG Mon May 1 23:56:04 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 AC1BB16A419; Mon, 1 May 2006 23:56:04 +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 877AE16A401 for ; Mon, 1 May 2006 23:56:04 +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 381CF43D49 for ; Mon, 1 May 2006 23:56:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41Nu4cC046127 for ; Mon, 1 May 2006 23:56:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41Nu3fi046124 for perforce@freebsd.org; Mon, 1 May 2006 23:56:03 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 23:56:03 GMT Message-Id: <200605012356.k41Nu3fi046124@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 96531 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: Mon, 01 May 2006 23:56:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=96531 Change 96531 by jb@jb_freebsd2 on 2006/05/01 23:55:18 Just a few remaining issues with this function. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#6 (text+ko) ==== @@ -32,8 +32,10 @@ cookie = dtrace_interrupt_disable(); probe = dtrace_probes[id - 1]; cpuid = CPU->cpu_id; -#ifdef DOODAD + +#if defined(sun) onintr = CPU_ON_INTR(CPU); +#endif if (!onintr && probe->dtpr_predcache != DTRACE_CACHEIDNONE && probe->dtpr_predcache == curthread->t_predcache) { @@ -45,6 +47,7 @@ return; } +#if defined(sun) if (panic_quiesce) { /* * We don't trace anything if we're panicking. @@ -52,8 +55,6 @@ dtrace_interrupt_enable(cookie); return; } -#else -onintr = 0; #endif now = dtrace_gethrtime(); @@ -157,13 +158,12 @@ * profile case, the check above will ensure that * we're examining a user context. */ +#ifdef DOODAD if (ecb->dte_cond & DTRACE_COND_OWNER) { -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); -#ifdef DOODAD cred_t *cr; cred_t *s_cr = ecb->dte_state->dts_cred.dcr_cred; - proc_t *proc; + proc_t *proc = NULL; ASSERT(s_cr != NULL); @@ -177,12 +177,11 @@ (proc = ttoproc(curthread)) == NULL || (proc->p_flag & SNOCD)) continue; + } #endif - } +#if defined(sun) if (ecb->dte_cond & DTRACE_COND_ZONEOWNER) { -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); -#ifdef DOODAD cred_t *cr; cred_t *s_cr = ecb->dte_state->dts_cred.dcr_cred; @@ -193,8 +192,8 @@ s_cr->cr_zone->zone_id != cr->cr_zone->zone_id) continue; + } #endif - } } if (now - state->dts_alive > dtrace_deadman_timeout) { @@ -322,11 +321,10 @@ if (!dtrace_priv_proc(state)) continue; +#if defined(sun) /* * See comment in DIF_VAR_PID. */ -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); -#ifdef DOODAD if (DTRACE_ANCHORED(mstate.dtms_probe) && CPU_ON_INTR(CPU)) { int depth = DTRACE_USTACK_NFRAMES( @@ -446,7 +444,7 @@ case DTRACEACT_USYM: case DTRACEACT_UMOD: case DTRACEACT_UADDR: { -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); +printf("%s(%d): USYM, UMOD or UADDR\n",__FUNCTION__,__LINE__); #ifdef DOODAD struct pid *pid = curthread->t_procp->p_pidp;