|
@@ -89,18 +89,19 @@ static int show_stat(struct seq_file *p, void *v)
|
|
|
}
|
|
|
sum += arch_irq_stat();
|
|
|
|
|
|
- seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu "
|
|
|
- "%llu\n",
|
|
|
- (unsigned long long)cputime64_to_clock_t(user),
|
|
|
- (unsigned long long)cputime64_to_clock_t(nice),
|
|
|
- (unsigned long long)cputime64_to_clock_t(system),
|
|
|
- (unsigned long long)cputime64_to_clock_t(idle),
|
|
|
- (unsigned long long)cputime64_to_clock_t(iowait),
|
|
|
- (unsigned long long)cputime64_to_clock_t(irq),
|
|
|
- (unsigned long long)cputime64_to_clock_t(softirq),
|
|
|
- (unsigned long long)cputime64_to_clock_t(steal),
|
|
|
- (unsigned long long)cputime64_to_clock_t(guest),
|
|
|
- (unsigned long long)cputime64_to_clock_t(guest_nice));
|
|
|
+ seq_puts(p, "cpu ");
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(system));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(idle));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(iowait));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(irq));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(softirq));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(steal));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest_nice));
|
|
|
+ seq_putc(p, '\n');
|
|
|
+
|
|
|
for_each_online_cpu(i) {
|
|
|
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
|
|
|
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
|
|
@@ -113,26 +114,24 @@ static int show_stat(struct seq_file *p, void *v)
|
|
|
steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
|
|
|
guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
|
|
|
guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
|
|
|
- seq_printf(p,
|
|
|
- "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu "
|
|
|
- "%llu\n",
|
|
|
- i,
|
|
|
- (unsigned long long)cputime64_to_clock_t(user),
|
|
|
- (unsigned long long)cputime64_to_clock_t(nice),
|
|
|
- (unsigned long long)cputime64_to_clock_t(system),
|
|
|
- (unsigned long long)cputime64_to_clock_t(idle),
|
|
|
- (unsigned long long)cputime64_to_clock_t(iowait),
|
|
|
- (unsigned long long)cputime64_to_clock_t(irq),
|
|
|
- (unsigned long long)cputime64_to_clock_t(softirq),
|
|
|
- (unsigned long long)cputime64_to_clock_t(steal),
|
|
|
- (unsigned long long)cputime64_to_clock_t(guest),
|
|
|
- (unsigned long long)cputime64_to_clock_t(guest_nice));
|
|
|
+ seq_printf(p, "cpu%d", i);
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(system));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(idle));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(iowait));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(irq));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(softirq));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(steal));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest));
|
|
|
+ seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest_nice));
|
|
|
+ seq_putc(p, '\n');
|
|
|
}
|
|
|
seq_printf(p, "intr %llu", (unsigned long long)sum);
|
|
|
|
|
|
/* sum again ? it could be updated? */
|
|
|
for_each_irq_nr(j)
|
|
|
- seq_printf(p, " %u", kstat_irqs(j));
|
|
|
+ seq_put_decimal_ull(p, ' ', kstat_irqs(j));
|
|
|
|
|
|
seq_printf(p,
|
|
|
"\nctxt %llu\n"
|
|
@@ -149,7 +148,7 @@ static int show_stat(struct seq_file *p, void *v)
|
|
|
seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
|
|
|
|
|
|
for (i = 0; i < NR_SOFTIRQS; i++)
|
|
|
- seq_printf(p, " %u", per_softirq_sums[i]);
|
|
|
+ seq_put_decimal_ull(p, ' ', per_softirq_sums[i]);
|
|
|
seq_putc(p, '\n');
|
|
|
|
|
|
return 0;
|