From owner-svn-src-user@FreeBSD.ORG Wed Nov 12 01:22:26 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CC9B1065689; Wed, 12 Nov 2008 01:22:26 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 202C48FC12; Wed, 12 Nov 2008 01:22:26 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAC1MQp3016394; Wed, 12 Nov 2008 01:22:26 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAC1MQSU016393; Wed, 12 Nov 2008 01:22:26 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200811120122.mAC1MQSU016393@svn.freebsd.org> From: Kip Macy Date: Wed, 12 Nov 2008 01:22:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184859 - user/kmacy/HEAD_fast_multi_xmit/sys/dev/hwpmc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2008 01:22:26 -0000 Author: kmacy Date: Wed Nov 12 01:22:25 2008 New Revision: 184859 URL: http://svn.freebsd.org/changeset/base/184859 Log: skip ignored sample entries earlier in the loop Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/hwpmc/hwpmc_mod.c Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/dev/hwpmc/hwpmc_mod.c Tue Nov 11 23:08:20 2008 (r184858) +++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/hwpmc/hwpmc_mod.c Wed Nov 12 01:22:25 2008 (r184859) @@ -961,12 +961,12 @@ pmc_attach_one_process(struct proc *p, s /* issue an attach event to a configured log file */ if (pm->pm_owner->po_flags & PMC_PO_OWNS_LOGFILE) { - pmc_getfilename(p->p_textvp, &fullpath, &freepath); if (p->p_flag & P_KTHREAD) { fullpath = kernelname; freepath = NULL; } else - pmclog_process_pmcattach(pm, p->p_pid, fullpath); + pmc_getfilename(p->p_textvp, &fullpath, &freepath); + pmclog_process_pmcattach(pm, p->p_pid, fullpath); if (freepath) free(freepath, M_TEMP); if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) @@ -3916,25 +3916,27 @@ pmc_process_samples(int cpu) for (n = 0; n < pmc_nsamples; n++) { /* bound on #iterations */ ps = psb->ps_read; + pm = ps->ps_pmc; + if (ps->ps_nsamples == PMC_SAMPLE_FREE) break; + + /* Ignore PMCs that have been switched off */ + if (pm->pm_state != PMC_STATE_RUNNING) + goto entrydone; + if (ps->ps_nsamples == PMC_SAMPLE_INUSE) { /* Need a rescan at a later time. */ atomic_set_rel_int(&pmc_cpumask, (1 << cpu)); break; } - pm = ps->ps_pmc; po = pm->pm_owner; KASSERT(PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)), ("[pmc,%d] pmc=%p non-sampling mode=%d", __LINE__, pm, PMC_TO_MODE(pm))); - /* Ignore PMCs that have been switched off */ - if (pm->pm_state != PMC_STATE_RUNNING) - goto entrydone; - PMCDBG(SAM,OPS,1,"cpu=%d pm=%p n=%d fl=%x wr=%d rd=%d", cpu, pm, ps->ps_nsamples, ps->ps_flags, (int) (psb->ps_write - psb->ps_samples),