From owner-svn-src-all@FreeBSD.ORG  Fri Jul 15 11:46:55 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 372391065672;
	Fri, 15 Jul 2011 11:46:55 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E8058FC08;
	Fri, 15 Jul 2011 11:46:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6FBksj0078826;
	Fri, 15 Jul 2011 11:46:54 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6FBkscL078824;
	Fri, 15 Jul 2011 11:46:54 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201107151146.p6FBkscL078824@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Fri, 15 Jul 2011 11:46:54 +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: r224058 - head/usr.sbin/pmccontrol
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jul 2011 11:46:55 -0000

Author: attilio
Date: Fri Jul 15 11:46:54 2011
New Revision: 224058
URL: http://svn.freebsd.org/changeset/base/224058

Log:
  Fix logical_cpus_mask retrieving by using, correctly, cpuset_t.
  This fix also a bug where pmccontrol uses a 32 static type rather than
  old cpumask_t.
  
  Reported and reviewed by:	avg

Modified:
  head/usr.sbin/pmccontrol/pmccontrol.c

Modified: head/usr.sbin/pmccontrol/pmccontrol.c
==============================================================================
--- head/usr.sbin/pmccontrol/pmccontrol.c	Fri Jul 15 11:30:41 2011	(r224057)
+++ head/usr.sbin/pmccontrol/pmccontrol.c	Fri Jul 15 11:46:54 2011	(r224058)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/queue.h>
+#include <sys/cpuset.h>
 #include <sys/sysctl.h>
 
 #include <assert.h>
@@ -220,9 +221,10 @@ pmcc_do_enable_disable(struct pmcc_op_li
 static int
 pmcc_do_list_state(void)
 {
-	size_t dummy;
+	cpuset_t logical_cpus_mask;
+	long cpusetsize;
+	size_t setsize;
 	int c, cpu, n, npmc, ncpu;
-	unsigned int logical_cpus_mask;
 	struct pmc_info *pd;
 	struct pmc_pmcinfo *pi;
 	const struct pmc_cpuinfo *pc;
@@ -234,17 +236,22 @@ pmcc_do_list_state(void)
 	       pmc_name_of_cputype(pc->pm_cputype),
 		pc->pm_npmc);
 
-	dummy = sizeof(logical_cpus_mask);
+	/* Determine the set of logical CPUs. */
+	cpusetsize = sysconf(_SC_CPUSET_SIZE);
+	if (cpusetsize == -1 || (u_long)cpusetsize > sizeof(cpuset_t))
+		err(EX_OSERR, "Cannot determine which CPUs are logical");
+	CPU_ZERO(&logical_cpus_mask);
+	setsize = (size_t)cpusetsize;
 	if (sysctlbyname("machdep.logical_cpus_mask", &logical_cpus_mask,
-		&dummy, NULL, 0) < 0)
-		logical_cpus_mask = 0;
+	    &setsize, NULL, 0) < 0)
+		CPU_ZERO(&logical_cpus_mask);
 
 	ncpu = pc->pm_ncpu;
 
 	for (c = cpu = 0; cpu < ncpu; cpu++) {
 #if	defined(__i386__) || defined(__amd64__)
 		if (pc->pm_cputype == PMC_CPU_INTEL_PIV &&
-		    (logical_cpus_mask & (1 << cpu)))
+		    CPU_ISSET(cpu, &logical_cpus_mask))
 			continue; /* skip P4-style 'logical' cpus */
 #endif
 		if (pmc_pmcinfo(cpu, &pi) < 0) {