mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Fix a couple of issues in the interrupt code:

Browse Source 
- Replace overly-complicated (and buggy) -a logic with a much simpler
   version: -a causes all interrupts to be displayed, otherwise only
   those that have occurred are displayed.  This removes the need for
   any MD code.

 - Instead of just making sure intrcnt is large enough, figure out the
   exact size it needs to be.  We derive nintr from this number, and we
   don't want to risk printing garbage.  Note that on sparc64, we end up
   printing garbage anyway because the names of non-existent interrupts
   are left uninitialized by the kernel.

Tested on:	alpha, i386, sparc64
This commit is contained in:
Dag-Erling Smørgrav 2003-12-10 22:11:51 +00:00
parent 5352eb6bb1
commit 7d268144f1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=123409
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
usr.bin/vmstat/vmstat.c
View File

@ -835,29 +835,28 @@ static void
dointr(void) dointr(void)
{ {
unsigned long *intrcnt, uptime; unsigned long *intrcnt, uptime;
u_int64_t inttotal; uint64_t inttotal;
size_t clen, nintr, inamlen, i, istrnamlen; size_t clen, inamlen, intrcntlen, istrnamlen;
unsigned int i, nintr;
char *intrname, *tintrname; char *intrname, *tintrname;
uptime = getuptime(); uptime = getuptime();
if (kd != NULL) { if (kd != NULL) {
nintr = namelist[X_EINTRCNT].n_value - intrcntlen = namelist[X_EINTRCNT].n_value -
namelist[X_INTRCNT].n_value; namelist[X_INTRCNT].n_value;
inamlen = namelist[X_EINTRNAMES].n_value - inamlen = namelist[X_EINTRNAMES].n_value -
namelist[X_INTRNAMES].n_value; namelist[X_INTRNAMES].n_value;
if ((intrcnt = malloc(nintr)) == NULL || if ((intrcnt = malloc(intrcntlen)) == NULL ||
(intrname = malloc(inamlen)) == NULL) (intrname = malloc(inamlen)) == NULL)
err(1, "malloc()"); err(1, "malloc()");
kread(X_INTRCNT, intrcnt, nintr); kread(X_INTRCNT, intrcnt, intrcntlen);
kread(X_INTRNAMES, intrname, inamlen); kread(X_INTRNAMES, intrname, inamlen);
} else { } else {
for (intrcnt = NULL, nintr = 1024; ; nintr *= 2) { mysysctl("hw.intrcnt", NULL, &intrcntlen, NULL, 0);
if ((intrcnt = reallocf(intrcnt, nintr)) == NULL) fprintf(stderr, "intrcntlen = %lu\n", (unsigned long)intrcntlen);
err(1, "reallocf()"); if ((intrcnt = malloc(intrcntlen)) == NULL)
if (mysysctl("hw.intrcnt", err(1, "calloc()");
intrcnt, &nintr, NULL, 0) == 0) mysysctl("hw.intrcnt", intrcnt, &intrcntlen, NULL, 0);
break;
}
for (intrname = NULL, inamlen = 1024; ; inamlen *= 2) { for (intrname = NULL, inamlen = 1024; ; inamlen *= 2) {
if ((intrname = reallocf(intrname, inamlen)) == NULL) if ((intrname = reallocf(intrname, inamlen)) == NULL)
err(1, "reallocf()"); err(1, "reallocf()");
@ -866,7 +865,7 @@ dointr(void)
break; break;
} }
} }
nintr /= sizeof(unsigned long); nintr = intrcntlen / sizeof(unsigned long);
tintrname = intrname; tintrname = intrname;
istrnamlen = strlen("interrupt"); istrnamlen = strlen("interrupt");
for (i = 0; i < nintr; i++) { for (i = 0; i < nintr; i++) {
@ -880,14 +879,7 @@ dointr(void)
inttotal = 0; inttotal = 0;
for (i = 0; i < nintr; i++) { for (i = 0; i < nintr; i++) {
const char *p; const char *p;
if (intrname[0] != '\0' && if (intrname[0] != '\0' && (*intrcnt != 0 || aflag))
(aflag > 0 || *intrcnt != 0) &&
#ifdef __ia64__
(aflag > 1 || *intrname != '#'))
#else
(aflag > 1 || ((p = strchr(intrname, ' ')) && p[1] != ' ')) &&
(aflag > 2 || strncmp(intrname, "stray ", 6) != 0))
#endif
(void)printf("%-*s %20lu %10lu\n", istrnamlen, intrname, (void)printf("%-*s %20lu %10lu\n", istrnamlen, intrname,
*intrcnt, *intrcnt / uptime); *intrcnt, *intrcnt / uptime);
intrname += strlen(intrname) + 1; intrname += strlen(intrname) + 1;