emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpstat: fix total par-cpu IRQ counts

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-07-30 13:38:46 +02:00
parent 64c67891a2
commit 9bb0510b9b
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
procps/mpstat.c
View File

@ -163,6 +163,7 @@ static double percent_value(data_t prev, data_t curr, data_t itv)
static double hz_value(data_t prev, data_t curr, data_t itv) static double hz_value(data_t prev, data_t curr, data_t itv)
{ {
//bb_error_msg("curr:%lld prev:%lld G.hz:%u", curr, prev, G.hz);
return ((double)overflow_safe_sub(prev, curr)) / itv * G.hz; return ((double)overflow_safe_sub(prev, curr)) / itv * G.hz;
} }
@ -413,6 +414,8 @@ static void write_stats_core(int prev, int current,
continue; continue;
} }
} }
//bb_error_msg("G.st_irq[%u][%u].irq_nr:%lld - G.st_irq[%u][%u].irq_nr:%lld",
// current, cpu, G.st_irq[prev][cpu].irq_nr, prev, cpu, G.st_irq[current][cpu].irq_nr);
printf(" %9.2f\n", hz_value(G.st_irq[prev][cpu].irq_nr, G.st_irq[current][cpu].irq_nr, per_cpu_itv)); printf(" %9.2f\n", hz_value(G.st_irq[prev][cpu].irq_nr, G.st_irq[current][cpu].irq_nr, per_cpu_itv));
} }
} }
@ -523,17 +526,24 @@ static void get_cpu_statistics(struct stats_cpu *cpu, data_t *up, data_t *up0)
static void get_irqs_from_stat(struct stats_irq *irq) static void get_irqs_from_stat(struct stats_irq *irq)
{ {
FILE *fp; FILE *fp;
unsigned cpu;
char buf[1024]; char buf[1024];
for (cpu = 1; cpu <= G.cpu_nr; cpu++) {
irq->irq_nr = 0;
}
fp = fopen_for_read(PROCFS_STAT); fp = fopen_for_read(PROCFS_STAT);
if (!fp) if (!fp)
return; return;
while (fgets(buf, sizeof(buf), fp)) { while (fgets(buf, sizeof(buf), fp)) {
if (strncmp(buf, "intr ", 5) == 0) //bb_error_msg("/proc/stat:'%s'", buf);
if (strncmp(buf, "intr ", 5) == 0) {
/* Read total number of IRQs since system boot */ /* Read total number of IRQs since system boot */
sscanf(buf + 5, "%"FMT_DATA"u", &irq->irq_nr); sscanf(buf + 5, "%"FMT_DATA"u", &irq->irq_nr);
} }
}
fclose(fp); fclose(fp);
} }
@ -554,12 +564,20 @@ static void get_irqs_from_interrupts(const char *fname,
unsigned irq; unsigned irq;
int cpu_index[G.cpu_nr]; int cpu_index[G.cpu_nr];
int iindex; int iindex;
int len, digit;
for (cpu = 1; cpu <= G.cpu_nr; cpu++) { // Moved to get_irqs_from_stat(), which is called once, not twice,
irq_i = &G.st_irq[current][cpu]; // unlike get_irqs_from_interrupts().
irq_i->irq_nr = 0; // Otherwise reading of /proc/softirqs
} // was resetting counts to 0 after we painstakingly collected them from
// /proc/interrupts. Which resulted in:
// 01:32:47 PM CPU intr/s
// 01:32:47 PM all 591.47
// 01:32:47 PM 0 0.00 <= ???
// 01:32:47 PM 1 0.00 <= ???
// for (cpu = 1; cpu <= G.cpu_nr; cpu++) {
// G.st_irq[current][cpu].irq_nr = 0;
// //bb_error_msg("G.st_irq[%u][%u].irq_nr=0", current, cpu);
// }
fp = fopen_for_read(fname); fp = fopen_for_read(fname);
if (!fp) if (!fp)
@ -587,11 +605,15 @@ static void get_irqs_from_interrupts(const char *fname,
while (fgets(buf, buflen, fp) while (fgets(buf, buflen, fp)
&& irq < irqs_per_cpu && irq < irqs_per_cpu
) { ) {
int len;
char last_char;
char *cp; char *cp;
/* Skip over "<irq>:" */
/* Skip over "IRQNAME:" */
cp = strchr(buf, ':'); cp = strchr(buf, ':');
if (!cp) if (!cp)
continue; continue;
last_char = cp[-1];
ic = &per_cpu_stats[current][irq]; ic = &per_cpu_stats[current][irq];
len = cp - buf; len = cp - buf;
@ -600,7 +622,6 @@ static void get_irqs_from_interrupts(const char *fname,
} }
safe_strncpy(ic->irq_name, buf, len + 1); safe_strncpy(ic->irq_name, buf, len + 1);
//bb_error_msg("%s: irq%d:'%s' buf:'%s'", fname, irq, ic->irq_name, buf); //bb_error_msg("%s: irq%d:'%s' buf:'%s'", fname, irq, ic->irq_name, buf);
digit = isdigit(buf[len - 1]);
cp++; cp++;
for (cpu = 0; cpu < iindex; cpu++) { for (cpu = 0; cpu < iindex; cpu++) {
@ -608,9 +629,11 @@ static void get_irqs_from_interrupts(const char *fname,
ic = &per_cpu_stats[current][cpu_index[cpu] * irqs_per_cpu + irq]; ic = &per_cpu_stats[current][cpu_index[cpu] * irqs_per_cpu + irq];
irq_i = &G.st_irq[current][cpu_index[cpu] + 1]; irq_i = &G.st_irq[current][cpu_index[cpu] + 1];
ic->interrupt = strtoul(cp, &next, 10); ic->interrupt = strtoul(cp, &next, 10);
if (digit) { /* Count only numerical IRQs */
/* Do not count non-numerical IRQs */ if (isdigit(last_char)) {
irq_i->irq_nr += ic->interrupt; irq_i->irq_nr += ic->interrupt;
//bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld",
// current, cpu_index[cpu] + 1, ic->interrupt, irq_i->irq_nr);
} }
cp = next; cp = next;
} }