Date: Fri, 30 Sep 2022 03:15:00 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 42dc8696df5e - main - vmstat: remove processor counting from getcpuinfo() Message-ID: <202209300315.28U3F0IN087905@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42dc8696df5e3004ea65fd315aba500d269dbcbf commit 42dc8696df5e3004ea65fd315aba500d269dbcbf Author: Elliott Mitchell <ehem+freebsd@m5p.com> AuthorDate: 2022-09-29 16:27:24 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2022-09-30 03:10:27 +0000 vmstat: remove processor counting from getcpuinfo() As `ncpus` was otherwise unused, keeping track was pointless. Gets rid of a warning from an unused variable. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36628 --- usr.bin/vmstat/vmstat.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index ba1dc9eef883..674ae2ab6728 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -604,18 +604,17 @@ fill_vmtotal(struct vmtotal *vmtp) } /* Determine how many cpu columns, and what index they are in kern.cp_times */ -static int +static void getcpuinfo(u_long *maskp, int *maxidp) { long *times; u_long mask; size_t size; - int empty, i, j, maxcpu, maxid, ncpus; + int empty, i, j, maxcpu, maxid; if (kd != NULL) xo_errx(1, "not implemented"); mask = 0; - ncpus = 0; size = sizeof(maxcpu); mysysctl("kern.smp.maxcpus", &maxcpu, &size); if (size != sizeof(maxcpu)) @@ -632,16 +631,13 @@ getcpuinfo(u_long *maskp, int *maxidp) if (times[i * CPUSTATES + j] != 0) empty = 0; } - if (!empty) { + if (!empty) mask |= (1ul << i); - ncpus++; - } } if (maskp) *maskp = mask; if (maxidp) *maxidp = maxid; - return (ncpus); } @@ -670,12 +666,11 @@ dovmstat(unsigned int interval, int reps) u_long cpumask; size_t size; time_t uptime, halfuptime; - int ncpus, maxid, rate_adj, retval; + int maxid, rate_adj, retval; uptime = getuptime() / 1000000000LL; halfuptime = uptime / 2; rate_adj = 1; - ncpus = 1; maxid = 0; cpumask = 0; @@ -714,7 +709,7 @@ dovmstat(unsigned int interval, int reps) } if (Pflag) { - ncpus = getcpuinfo(&cpumask, &maxid); + getcpuinfo(&cpumask, &maxid); size_cp_times = sizeof(long) * (maxid + 1) * CPUSTATES; cur_cp_times = calloc(1, size_cp_times); last_cp_times = calloc(1, size_cp_times);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209300315.28U3F0IN087905>