diff options
| author | avg <avg@FreeBSD.org> | 2011-07-15 11:30:41 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2011-07-15 11:30:41 +0000 |
| commit | 466a13c175275736c8af0c003ec4a4f0ec0abd48 (patch) | |
| tree | 6311d5740943ee37cb0406e019c3ce131651b2d9 /usr.sbin/pmcstat | |
| parent | 70f535313aa1ca4af3ed671bb68989fe80d925ae (diff) | |
| download | FreeBSD-src-466a13c175275736c8af0c003ec4a4f0ec0abd48.zip FreeBSD-src-466a13c175275736c8af0c003ec4a4f0ec0abd48.tar.gz | |
pmcstat, pmccontrol: catch up with removal of machdep.hlt_cpus sysctl
Reported by: Pan Tsu <inyaoo@gmail.com>
Reviewed by: attilio
No objections: gnn
Diffstat (limited to 'usr.sbin/pmcstat')
| -rw-r--r-- | usr.sbin/pmcstat/pmcstat.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index ab3846c..52e02a8 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -552,7 +552,7 @@ int main(int argc, char **argv) { double interval; - int option, npmc, ncpu, haltedcpus; + int option, npmc, ncpu; int c, check_driver_stats, current_cpu, current_sampling_count; int do_callchain, do_descendants, do_logproccsw, do_logprocexit; int do_print; @@ -617,14 +617,6 @@ main(int argc, char **argv) if (sysctlbyname("hw.ncpu", &ncpu, &dummy, NULL, 0) < 0) err(EX_OSERR, "ERROR: Cannot determine the number of CPUs"); cpumask = (1 << ncpu) - 1; - haltedcpus = 0; - if (ncpu > 1) { - if (sysctlbyname("machdep.hlt_cpus", &haltedcpus, &dummy, - NULL, 0) < 0) - err(EX_OSERR, "ERROR: Cannot determine which CPUs are " - "halted"); - cpumask &= ~haltedcpus; - } while ((option = getopt(argc, argv, "CD:EF:G:M:NO:P:R:S:TWc:df:gk:m:n:o:p:qr:s:t:vw:z:")) != -1) @@ -637,7 +629,7 @@ main(int argc, char **argv) case 'c': /* CPU */ if (optarg[0] == '*' && optarg[1] == '\0') - cpumask = ((1 << ncpu) - 1) & ~haltedcpus; + cpumask = (1 << ncpu) - 1; else cpumask = pmcstat_get_cpumask(optarg); |
