c3f8db99b
Denys Vlasenko
2011-05-07
Subject
preparatory patch
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
procps/iostat.c+20 -19
| @@ -128,6 +128,23 @@ static void print_timestamp(void) | |
| printf("%s\n", buf); | |
| } | |
| + | static cputime_t get_smp_uptime(void) |
| + | { |
| + | FILE *fp; |
| + | char buf[sizeof(long)*3 * 2 + 4]; |
| + | unsigned long sec, dec; |
| + | |
| + | fp = xfopen_for_read("/proc/uptime"); |
| + | |
| + | if (fgets(buf, sizeof(buf), fp)) |
| + | if (sscanf(buf, "%lu.%lu", &sec, &dec) != 2) |
| + | bb_error_msg_and_die("can't read /proc/uptime"); |
| + | |
| + | fclose(fp); |
| + | |
| + | return (cputime_t)sec * G.clk_tck + dec * G.clk_tck / 100; |
| + | } |
| + | |
| /* Fetch CPU statistics from /proc/stat */ | |
| static void get_cpu_statistics(struct stats_cpu *sc) | |
| { | |
| @@ -153,23 +170,6 @@ static void get_cpu_statistics(struct stats_cpu *sc) | |
| fclose(fp); | |
| } | |
| - | static cputime_t get_smp_uptime(void) |
| - | { |
| - | FILE *fp; |
| - | char buf[sizeof(long)*3 * 2 + 4]; |
| - | unsigned long sec, dec; |
| - | |
| - | fp = xfopen_for_read("/proc/uptime"); |
| - | |
| - | if (fgets(buf, sizeof(buf), fp)) |
| - | if (sscanf(buf, "%lu.%lu", &sec, &dec) != 2) |
| - | bb_error_msg_and_die("can't read /proc/uptime"); |
| - | |
| - | fclose(fp); |
| - | |
| - | return (cputime_t)sec * G.clk_tck + dec * G.clk_tck / 100; |
| - | } |
| - | |
| /* | |
| * Obtain current uptime in jiffies. | |
| * Uptime is sum of individual CPUs' uptimes. | |
| @@ -507,11 +507,12 @@ int iostat_main(int argc, char **argv) | |
| /* Store device names into device list */ | |
| while (*argv && !isdigit(*argv[0])) { | |
| - | if (strcmp(*argv, "ALL") != 0) |
| + | if (strcmp(*argv, "ALL") != 0) { |
| /* If not ALL, save device name */ | |
| save_to_devlist(*argv); | |
| - | else |
| + | } else { |
| G.show_all = 1; | |
| + | } |
| argv++; | |
| } | |