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

Rename a struct member from "interrupt"

Browse Source 
This is nonstandard, but common, keyword in embedded compilers.

Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Dan Fandrich 2010-08-23 22:23:04 -07:00 committed by Denys Vlasenko
parent 7ff6836db3
commit 159677c884
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
procps/mpstat.c
View File

@ -61,7 +61,7 @@ typedef long idata_t;
struct stats_irqcpu { struct stats_irqcpu {
unsigned interrupt; unsigned interrupts;
char irq_name[MAX_IRQNAME_LEN]; char irq_name[MAX_IRQNAME_LEN];
}; };
@ -265,7 +265,7 @@ static void write_irqcpu_stats(struct stats_irqcpu *per_cpu_stats[],
p = &per_cpu_stats[current][(cpu - 1) * total_irqs + j]; p = &per_cpu_stats[current][(cpu - 1) * total_irqs + j];
q = &per_cpu_stats[prev][(cpu - 1) * total_irqs + offset]; q = &per_cpu_stats[prev][(cpu - 1) * total_irqs + offset];
printf("%"INTRATE_SCRWIDTH_STR".2f", printf("%"INTRATE_SCRWIDTH_STR".2f",
(double)(p->interrupt - q->interrupt) / itv * G.hz); (double)(p->interrupts - q->interrupts) / itv * G.hz);
} else { } else {
printf(" N/A"); printf(" N/A");
} }
@ -617,12 +617,12 @@ static void get_irqs_from_interrupts(const char *fname,
char *next; char *next;
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->interrupts = strtoul(cp, &next, 10);
/* Count only numerical IRQs */ /* Count only numerical IRQs */
if (isdigit(last_char)) { if (isdigit(last_char)) {
irq_i->irq_nr += ic->interrupt; irq_i->irq_nr += ic->interrupts;
//bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld", //bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld",
// current, cpu_index[cpu] + 1, ic->interrupt, irq_i->irq_nr); // current, cpu_index[cpu] + 1, ic->interrupts, irq_i->irq_nr);
} }
cp = next; cp = next;
} }