From owner-svn-src-stable@FreeBSD.ORG Fri Dec 11 12:46:41 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3D28106566B; Fri, 11 Dec 2009 12:46:41 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A84658FC17; Fri, 11 Dec 2009 12:46:41 +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 nBBCkfdp009132; Fri, 11 Dec 2009 12:46:41 GMT (envelope-from fabient@svn.freebsd.org) Received: (from fabient@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBBCkfJ3009130; Fri, 11 Dec 2009 12:46:41 GMT (envelope-from fabient@svn.freebsd.org) Message-Id: <200912111246.nBBCkfJ3009130@svn.freebsd.org> From: Fabien Thomas Date: Fri, 11 Dec 2009 12:46:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200410 - stable/7/lib/libpmc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2009 12:46:41 -0000 Author: fabient Date: Fri Dec 11 12:46:41 2009 New Revision: 200410 URL: http://svn.freebsd.org/changeset/base/200410 Log: MFC 193809: Fix parsing of Core2 event qualifiers. Modified: stable/7/lib/libpmc/libpmc.c Directory Properties: stable/7/lib/libpmc/ (props changed) Modified: stable/7/lib/libpmc/libpmc.c ============================================================================== --- stable/7/lib/libpmc/libpmc.c Fri Dec 11 12:44:44 2009 (r200409) +++ stable/7/lib/libpmc/libpmc.c Fri Dec 11 12:46:41 2009 (r200410) @@ -609,22 +609,22 @@ iap_allocate_pmc(enum pmc_event pe, char pmc_config->pm_caps |= PMC_CAP_USER; } else if (KWMATCH(p, IAP_KW_ANYTHREAD)) { pmc_config->pm_md.pm_iap.pm_iap_config |= IAP_ANY; - } else if (KWMATCH(p, IAP_KW_CORE)) { + } else if (KWPREFIXMATCH(p, IAP_KW_CORE "=")) { n = pmc_parse_mask(iap_core_mask, p, &evmask); if (n != 1) return (-1); - } else if (KWMATCH(p, IAP_KW_AGENT)) { + } else if (KWPREFIXMATCH(p, IAP_KW_AGENT "=")) { n = pmc_parse_mask(iap_agent_mask, p, &evmask); if (n != 1) return (-1); - } else if (KWMATCH(p, IAP_KW_PREFETCH)) { + } else if (KWPREFIXMATCH(p, IAP_KW_PREFETCH "=")) { n = pmc_parse_mask(iap_prefetch_mask, p, &evmask); if (n != 1) return (-1); - } else if (KWMATCH(p, IAP_KW_CACHESTATE)) { + } else if (KWPREFIXMATCH(p, IAP_KW_CACHESTATE "=")) { n = pmc_parse_mask(iap_cachestate_mask, p, &cachestate); } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_CORE && - KWMATCH(p, IAP_KW_TRANSITION)) { + KWPREFIXMATCH(p, IAP_KW_TRANSITION "=")) { n = pmc_parse_mask(iap_transition_mask, p, &evmask); if (n != 1) return (-1); @@ -632,10 +632,10 @@ iap_allocate_pmc(enum pmc_event pe, char cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 || cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME || cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) { - if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) { + if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) { n = pmc_parse_mask(iap_snoopresponse_mask, p, &evmask); - } else if (KWMATCH(p, IAP_KW_SNOOPTYPE)) { + } else if (KWPREFIXMATCH(p, IAP_KW_SNOOPTYPE "=")) { n = pmc_parse_mask(iap_snooptype_mask, p, &evmask); } else