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

libbb: factor out common code from mpstat/iostat

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-08-16 02:49:21 +02:00
parent a4160e15ec
commit c9b9750a0e
5 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
procps/mpstat.c
View File

@@ -119,12 +119,6 @@ enum {
};
/* Does str start with "cpu"? */
static int starts_with_cpu(const char *str)
{
return !((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u'));
}
/* Is option on? */
static ALWAYS_INLINE int display_opt(int opt)
{
@@ -815,38 +809,6 @@ static void print_header(struct tm *t)
uts.sysname, uts.release, uts.nodename, cur_date, uts.machine, G.cpu_nr);
}
/*
* Get number of processors in /proc/stat
* Return value '0' means one CPU and non SMP kernel.
* Otherwise N means N processor(s) and SMP kernel.
*/
static int get_cpu_nr(void)
{
FILE *fp;
char line[256];
int proc_nr = -1;
fp = xfopen_for_read(PROCFS_STAT);
while (fgets(line, sizeof(line), fp)) {
if (!starts_with_cpu(line)) {
if (proc_nr >= 0)
break; /* we are past "cpuN..." lines */
continue;
}
if (line[3] != ' ') { /* "cpuN" */
int num_proc;
if (sscanf(line + 3, "%u", &num_proc) == 1
&& num_proc > proc_nr
) {
proc_nr = num_proc;
}
}
}
fclose(fp);
return proc_nr + 1;
}
/*
* Get number of interrupts available per processor
*/
@@ -910,7 +872,7 @@ int mpstat_main(int UNUSED_PARAM argc, char **argv)
G.interval = -1;
/* Get number of processors */
G.cpu_nr = get_cpu_nr();
G.cpu_nr = get_cpu_count();
/* Get number of clock ticks per sec */
G.hz = get_hz();