d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the cpuset API more consistently:

Browse Source 
- Fetch the root set from cpuset_getaffinity() instead of assuming all CPUs
  from 0 to hw.ncpu are the root set.
- Use CPU_SETSIZE and CPU_FFS.
- The original notion of halted CPUs the manpage and code refers to is gone.
  Use the term "available" instead.

Differential Revision:	https://reviews.freebsd.org/D2491
Reviewed by:	emaste
MFC after:	1 week
This commit is contained in:
John Baldwin 2015-05-27 13:54:37 +00:00
parent dfd828e931
commit ef16b9abd4
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/pmcstat/pmcstat.8
View File

@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd May 8, 2015
.Dd May 27, 2015
.Dt PMCSTAT 8
.Os
.Sh NAME
@ -246,8 +246,8 @@ Argument
.Ar cpu-spec
is a comma separated list of CPU numbers, or the literal
.Sq *
denoting all unhalted CPUs.
The default is to allocate system mode PMCs on all unhalted
denoting all available CPUs.
The default is to allocate system mode PMCs on all available
CPUs.
.It Fl d
Toggle between process mode PMCs measuring events for the target

45
usr.sbin/pmcstat/pmcstat.c
View File

@ -116,11 +116,10 @@ struct pmcstat_args args;
static void
pmcstat_clone_event_descriptor(struct pmcstat_ev *ev, const cpuset_t *cpumask)
{
int cpu, mcpu;
int cpu;
struct pmcstat_ev *ev_clone;
mcpu = sizeof(*cpumask) * NBBY;
for (cpu = 0; cpu < mcpu; cpu++) {
for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
if (!CPU_ISSET(cpu, cpumask))
continue;
@ -161,6 +160,7 @@ pmcstat_get_cpumask(const char *cpuspec, cpuset_t *cpumask)
CPU_SET(cpu, cpumask);
s = end + strspn(end, ", \t");
} while (*s);
assert(!CPU_EMPTY(cpumask));
}
void
@ -550,10 +550,10 @@ pmcstat_topexit(void)
int
main(int argc, char **argv)
{
cpuset_t cpumask;
cpuset_t cpumask, rootmask;
double interval;
double duration;
int hcpu, option, npmc, ncpu;
int option, npmc;
int c, check_driver_stats, current_sampling_count;
int do_callchain, do_descendants, do_logproccsw, do_logprocexit;
int do_print, do_read;
@ -618,14 +618,13 @@ main(int argc, char **argv)
err(EX_OSERR, "ERROR: Cannot determine path of running kernel");
/*
* The initial CPU mask specifies all non-halted CPUS in the
* system.
* The initial CPU mask specifies the root mask of this process
* which is usually all CPUs in the system.
*/
len = sizeof(int);
if (sysctlbyname("hw.ncpu", &ncpu, &len, NULL, 0) < 0)
err(EX_OSERR, "ERROR: Cannot determine the number of CPUs");
for (hcpu = 0; hcpu < ncpu; hcpu++)
CPU_SET(hcpu, &cpumask);
if (cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, -1,
sizeof(rootmask), &rootmask) == -1)
err(EX_OSERR, "ERROR: Cannot determine the root set of CPUs");
CPU_COPY(&rootmask, &cpumask);
while ((option = getopt(argc, argv,
"CD:EF:G:M:NO:P:R:S:TWa:c:df:gk:l:m:n:o:p:qr:s:t:vw:z:")) != -1)
@ -642,11 +641,9 @@ main(int argc, char **argv)
break;
case 'c': /* CPU */
if (optarg[0] == '*' && optarg[1] == '\0') {
for (hcpu = 0; hcpu < ncpu; hcpu++)
CPU_SET(hcpu, &cpumask);
} else
if (optarg[0] == '*' && optarg[1] == '\0')
CPU_COPY(&rootmask, &cpumask);
else
pmcstat_get_cpumask(optarg, &cpumask);
args.pa_flags |= FLAGS_HAS_CPUMASK;
@ -771,13 +768,9 @@ main(int argc, char **argv)
else
ev->ev_count = -1;
if (option == 'S' || option == 's') {
hcpu = sizeof(cpumask) * NBBY;
for (hcpu--; hcpu >= 0; hcpu--)
if (CPU_ISSET(hcpu, &cpumask))
break;
ev->ev_cpu = hcpu;
} else
if (option == 'S' || option == 's')
ev->ev_cpu = CPU_FFS(&cpumask);
else
ev->ev_cpu = PMC_CPU_ANY;
ev->ev_flags = 0;
@ -804,11 +797,9 @@ main(int argc, char **argv)
STAILQ_INSERT_TAIL(&args.pa_events, ev, ev_next);
if (option == 's' || option == 'S') {
hcpu = CPU_ISSET(ev->ev_cpu, &cpumask);
CPU_CLR(ev->ev_cpu, &cpumask);
pmcstat_clone_event_descriptor(ev, &cpumask);
if (hcpu != 0)
CPU_SET(ev->ev_cpu, &cpumask);
CPU_SET(ev->ev_cpu, &cpumask);
}
break;