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

mpstat: small code shrink

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-07-21 11:54:33 +02:00
parent 23e8c08fa2
commit 217df6ea9f
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
procps/mpstat.c
View File

@ -57,7 +57,6 @@ struct stats_irqcpu {
char irq_name[MAX_IRQ_LEN]; char irq_name[MAX_IRQ_LEN];
}; };
/* Structure for CPU statistics */
struct stats_cpu { struct stats_cpu {
data_t cpu_user; data_t cpu_user;
data_t cpu_nice; data_t cpu_nice;
@ -70,13 +69,12 @@ struct stats_cpu {
data_t cpu_guest; data_t cpu_guest;
}; };
/* Struct for interrupts statistics */
struct stats_irq { struct stats_irq {
data_t irq_nr; data_t irq_nr;
}; };
/* Globals. Try to sort by size. */ /* Globals. Sort by size and access frequency. */
struct globals { struct globals {
int interval; int interval;
int count; int count;
@ -451,11 +449,10 @@ static void get_cpu_statistics(struct stats_cpu *cpu, data_t *up, data_t *up0)
if (!starts_with_cpu(buf)) if (!starts_with_cpu(buf))
continue; /* not "cpu" */ continue; /* not "cpu" */
if (buf[3] == ' ') {
/* "cpu " */ cp = cpu; /* for "cpu " case */
cp = cpu; if (buf[3] != ' ') {
} else { /* "cpuN " */
/* "cpuN" */
if (G.cpu_nr == 0 if (G.cpu_nr == 0
|| sscanf(buf + 3, "%u ", &cpu_number) != 1 || sscanf(buf + 3, "%u ", &cpu_number) != 1
|| cpu_number >= G.cpu_nr || cpu_number >= G.cpu_nr
@ -465,17 +462,16 @@ static void get_cpu_statistics(struct stats_cpu *cpu, data_t *up, data_t *up0)
cp = &cpu[cpu_number + 1]; cp = &cpu[cpu_number + 1];
} }
/* Read the jiffies, save them */ /* Read the counters, save them */
/* Not all fields have to be present */ /* Not all fields have to be present */
memset(cp, 0, sizeof(*cp)); memset(cp, 0, sizeof(*cp));
sscanf(skip_non_whitespace(buf + 3), sscanf(buf, "%*s"
" %"FMT_DATA"u %"FMT_DATA"u %"FMT_DATA"u" " %"FMT_DATA"u %"FMT_DATA"u %"FMT_DATA"u"
" %"FMT_DATA"u %"FMT_DATA"u %"FMT_DATA"u" " %"FMT_DATA"u %"FMT_DATA"u %"FMT_DATA"u"
" %"FMT_DATA"u %"FMT_DATA"u %"FMT_DATA"u", " %"FMT_DATA"u %"FMT_DATA"u %"FMT_DATA"u",
&cp->cpu_user, &cp->cpu_nice, &cp->cpu_system, &cp->cpu_user, &cp->cpu_nice, &cp->cpu_system,
&cp->cpu_idle, &cp->cpu_iowait, &cp->cpu_irq, &cp->cpu_idle, &cp->cpu_iowait, &cp->cpu_irq,
&cp->cpu_softirq, &cp->cpu_steal, &cp->cpu_softirq, &cp->cpu_steal, &cp->cpu_guest
&cp->cpu_guest
); );
/* /*
* Compute uptime in jiffies (1/HZ), it'll be the sum of * Compute uptime in jiffies (1/HZ), it'll be the sum of
@ -490,7 +486,7 @@ static void get_cpu_statistics(struct stats_cpu *cpu, data_t *up, data_t *up0)
/* "cpu " */ /* "cpu " */
*up = sum; *up = sum;
} else { } else {
/* "cpuN" */ /* "cpuN " */
if (cpu_number == 0 && *up0 != 0) { if (cpu_number == 0 && *up0 != 0) {
/* Compute uptime of single CPU */ /* Compute uptime of single CPU */
*up0 = sum; *up0 = sum;
@ -769,7 +765,7 @@ static void print_header(struct tm *t)
strftime(cur_date, sizeof(cur_date), "%x", t); strftime(cur_date, sizeof(cur_date), "%x", t);
printf("%s %s (%s) \t%s \t_%s_\t(%d CPU)\n", printf("%s %s (%s)\t%s\t_%s_\t(%u CPU)\n",
uts.sysname, uts.release, uts.nodename, cur_date, uts.machine, G.cpu_nr); uts.sysname, uts.release, uts.nodename, cur_date, uts.machine, G.cpu_nr);
} }