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

preparatory patch

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-05-07 04:36:46 +02:00
parent 4d6059eedc
commit c3f8db99bf
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
procps/iostat.c
View File

@@ -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++;
}