From owner-svn-src-head@FreeBSD.ORG Mon Aug 2 17:20:59 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C981C1065674; Mon, 2 Aug 2010 17:20:59 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7AA68FC08; Mon, 2 Aug 2010 17:20:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o72HKxFN086685; Mon, 2 Aug 2010 17:20:59 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o72HKxUV086682; Mon, 2 Aug 2010 17:20:59 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201008021720.o72HKxUV086682@svn.freebsd.org> From: Rui Paulo Date: Mon, 2 Aug 2010 17:20:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210775 - head/cddl/contrib/opensolaris/lib/libdtrace/common X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2010 17:21:00 -0000 Author: rpaulo Date: Mon Aug 2 17:20:59 2010 New Revision: 210775 URL: http://svn.freebsd.org/changeset/base/210775 Log: Fix the result of a mismerge. MUTEX_HELD should be DT_MUTEX_HELD() and Plmid() is not supposed to be called. Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Mon Aug 2 17:01:23 2010 (r210774) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Mon Aug 2 17:20:59 2010 (r210775) @@ -444,7 +444,9 @@ dt_pid_mod_filt(void *arg, const prmap_t if (gmatch(pp->dpp_obj, pp->dpp_mod)) return (dt_pid_per_mod(pp, pmp, obj)); +#if defined(sun) (void) Plmid(pp->dpp_pr, pmp->pr_vaddr, &pp->dpp_lmid); +#endif dt_pid_objname(name, sizeof (name), pp->dpp_lmid, pp->dpp_obj); @@ -676,7 +678,7 @@ dt_pid_create_usdt_probes(dtrace_probede struct ps_prochandle *P = dpr->dpr_proc; int ret = 0; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); #ifdef DOODAD (void) Pupdate_maps(P); Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c Mon Aug 2 17:01:23 2010 (r210774) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c Mon Aug 2 17:20:59 2010 (r210775) @@ -99,7 +99,7 @@ dt_proc_bpcreate(dt_proc_t *dpr, uintptr struct ps_prochandle *P = dpr->dpr_proc; dt_bkpt_t *dbp; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); if ((dbp = dt_zalloc(dpr->dpr_hdl, sizeof (dt_bkpt_t))) != NULL) { dbp->dbp_func = func; @@ -126,7 +126,7 @@ dt_proc_bpdestroy(dt_proc_t *dpr, int de #endif dt_bkpt_t *dbp, *nbp; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = nbp) { printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); @@ -150,7 +150,7 @@ dt_proc_bpmatch(dtrace_hdl_t *dtp, dt_pr const lwpstatus_t *psp = &Pstatus(dpr->dpr_proc)->pr_lwp; dt_bkpt_t *dbp; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = dt_list_next(dbp)) { @@ -177,7 +177,7 @@ dt_proc_bpenable(dt_proc_t *dpr) { dt_bkpt_t *dbp; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = dt_list_next(dbp)) { @@ -197,7 +197,7 @@ dt_proc_bpdisable(dt_proc_t *dpr) { dt_bkpt_t *dbp; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = dt_list_next(dbp)) { @@ -248,7 +248,7 @@ dt_proc_notify(dtrace_hdl_t *dtp, dt_pro static void dt_proc_stop(dt_proc_t *dpr, uint8_t why) { - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); assert(why != DT_PROC_STOP_IDLE); if (dpr->dpr_stop & why) { @@ -350,7 +350,7 @@ dt_proc_attach(dt_proc_t *dpr, int exec) rd_err_e err; GElf_Sym sym; - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); if (exec) { if (psp->pr_lwp.pr_errno != 0) @@ -416,7 +416,7 @@ dt_proc_waitrun(dt_proc_t *dpr) const long wstop = PCWSTOP; int pfd = Pctlfd(P); - assert(MUTEX_HELD(&dpr->dpr_lock)); + assert(DT_MUTEX_HELD(&dpr->dpr_lock)); assert(psp->pr_flags & PR_STOPPED); assert(Pstate(P) == PS_STOP);