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

top(1): correctly reset per-cpu counters

Browse Source 
I had changed this from a for loop to a memset during an earlier
cleanup. This change was incorrect so revert it.

While here, clean up

Reported by:	flo
This commit is contained in:
Eitan Adler 2018-06-09 23:24:08 +00:00
parent d506aa140d
commit 6e0632db3d
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.bin/top/display.c
View File

@ -162,28 +162,23 @@ display_resize(void)
int display_updatecpus(struct statics *statics)
{
int *lp;
int lines;
int i;
/* call resize to do the dirty work */
lines = display_resize();
if (pcpu_stats)
num_cpus = statics->ncpus;
num_cpus = statics->ncpus;
else
num_cpus = 1;
num_cpus = 1;
cpustates_column = 5; /* CPU: */
if (num_cpus != 1)
cpustates_column += 2; /* CPU 0: */
for (i = num_cpus; i > 9; i /= 10)
cpustates_column++;
if (num_cpus > 1) {
cpustates_column += 1 + digits(num_cpus); /* CPU #: */
}
/* fill the "last" array with all -1s, to insure correct updating */
lp = lcpustates;
i = num_cpustates * num_cpus;
while (--i >= 0)
{
*lp++ = -1;
for (i = 0; i < num_cpustates * num_cpus; ++i) {
lcpustates[i] = -1;
}
return(lines);
@ -541,7 +536,9 @@ z_cpustates(void)
}
/* fill the "last" array with all -1s, to insure correct updating */
memset(lcpustates, -1, num_cpustates * num_cpus);
for (i = 0; i < num_cpustates * num_cpus; ++i) {
lcpustates[i] = -1;
}
}
/*

4
usr.bin/top/utils.c
View File

@ -134,8 +134,8 @@ digits(int val)
while (val > 0)
{
cnt++;
val /= 10;
cnt++;
val /= 10;
}
return(cnt);
}