libbb: factor out common code from mpstat/iostat

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
author: Denys Vlasenko <vda.linux@googlemail.com> 2010-08-16 02:49:21 +0200
committer: Denys Vlasenko <vda.linux@googlemail.com> 2010-08-16 02:49:21 +0200
commit: c9b9750a0e2a85d3d045cc8d0217d4605f2d7989 (patch)
tree: 00168254b5f9e960ce42ea36d6d4a78bd269eae4 /procps
parent: a4160e15ec866005f3ad30c967bc4829fbb1c8e3 (diff)
download: busybox-w32-c9b9750a0e2a85d3d045cc8d0217d4605f2d7989.tar.gz
busybox-w32-c9b9750a0e2a85d3d045cc8d0217d4605f2d7989.tar.bz2
busybox-w32-c9b9750a0e2a85d3d045cc8d0217d4605f2d7989.zip
2 files changed, 4 insertions, 66 deletions
diff --git a/procps/iostat.c b/procps/iostat.c
index 76c5353cc..e8e321b8d 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -114,26 +114,6 @@ static void print_header(void)
                        buf, uts.machine, G.total_cpus);
 }
-static int get_number_of_cpus(void)
-{
-#ifdef _SC_NPROCESSORS_CONF
-        return sysconf(_SC_NPROCESSORS_CONF);
-#else
-        char buf[128];
-        int n = 0;
-        FILE *fp;
-        fp = xfopen_for_read("/proc/cpuinfo");
-        while (fgets(buf, sizeof(buf), fp))
-                if (strncmp(buf, "processor\t:", 11) == 0)
-                        n++;
-        fclose(fp);
-        return n;
-#endif
-}
 static void get_localtime(struct tm *ptm)
 {
        time_t timer;
@@ -148,12 +128,6 @@ static void print_timestamp(void)
        printf("%s\n", buf);
 }
-/* Does str start with "cpu"? */
-static int starts_with_cpu(const char *str)
-{
-        return ((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u')) == 0;
-}
 /* Fetch CPU statistics from /proc/stat */
 static void get_cpu_statistics(struct stats_cpu *sc)
 {
@@ -509,7 +483,9 @@ int iostat_main(int argc, char **argv)
        G.clk_tck = get_user_hz();
        /* Determine number of CPUs */
-        G.total_cpus = get_number_of_cpus();
+        G.total_cpus = get_cpu_count();
+        if (G.total_cpus == 0)
+                G.total_cpus = 1;
        /* Parse and process arguments */
        /* -k and -m are mutually exclusive */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 85cbb45db..b4520cb55 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -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)
 {
@@ -816,38 +810,6 @@ static void print_header(struct tm *t)
 }
 /*
- * 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
 */
 static int get_irqcpu_nr(const char *f, int max_irqs)
@@ -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();
author	Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 02:49:21 +0200
committer	Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 02:49:21 +0200
commit	c9b9750a0e2a85d3d045cc8d0217d4605f2d7989 (patch)
tree	00168254b5f9e960ce42ea36d6d4a78bd269eae4 /procps
parent	a4160e15ec866005f3ad30c967bc4829fbb1c8e3 (diff)
download	busybox-w32-c9b9750a0e2a85d3d045cc8d0217d4605f2d7989.tar.gz busybox-w32-c9b9750a0e2a85d3d045cc8d0217d4605f2d7989.tar.bz2 busybox-w32-c9b9750a0e2a85d3d045cc8d0217d4605f2d7989.zip

diff --git a/procps/iostat.c b/procps/iostat.c index 76c5353cc..e8e321b8d 100644 --- a/procps/iostat.c +++ b/procps/iostat.c
@@ -114,26 +114,6 @@ static void print_header(void)
114	buf, uts.machine, G.total_cpus);	114	buf, uts.machine, G.total_cpus);
115	}	115	}
116		116
117	static int get_number_of_cpus(void)
118	{
119	#ifdef _SC_NPROCESSORS_CONF
120	return sysconf(_SC_NPROCESSORS_CONF);
121	#else
122	char buf[128];
123	int n = 0;
124	FILE *fp;
125
126	fp = xfopen_for_read("/proc/cpuinfo");
127
128	while (fgets(buf, sizeof(buf), fp))
129	if (strncmp(buf, "processor\t:", 11) == 0)
130	n++;
131
132	fclose(fp);
133	return n;
134	#endif
135	}
136
137	static void get_localtime(struct tm *ptm)	117	static void get_localtime(struct tm *ptm)
138	{	118	{
139	time_t timer;	119	time_t timer;
@@ -148,12 +128,6 @@ static void print_timestamp(void)
148	printf("%s\n", buf);	128	printf("%s\n", buf);
149	}	129	}
150		130
151	/* Does str start with "cpu"? */
152	static int starts_with_cpu(const char *str)
153	{
154	return ((str[0] - 'c') \| (str[1] - 'p') \| (str[2] - 'u')) == 0;
155	}
156
157	/* Fetch CPU statistics from /proc/stat */	131	/* Fetch CPU statistics from /proc/stat */
158	static void get_cpu_statistics(struct stats_cpu *sc)	132	static void get_cpu_statistics(struct stats_cpu *sc)
159	{	133	{
@@ -509,7 +483,9 @@ int iostat_main(int argc, char **argv)
509	G.clk_tck = get_user_hz();	483	G.clk_tck = get_user_hz();
510		484
511	/* Determine number of CPUs */	485	/* Determine number of CPUs */
512	G.total_cpus = get_number_of_cpus();	486	G.total_cpus = get_cpu_count();
		487	if (G.total_cpus == 0)
		488	G.total_cpus = 1;
513		489
514	/* Parse and process arguments */	490	/* Parse and process arguments */
515	/* -k and -m are mutually exclusive */	491	/* -k and -m are mutually exclusive */


diff --git a/procps/mpstat.c b/procps/mpstat.c index 85cbb45db..b4520cb55 100644 --- a/procps/mpstat.c +++ b/procps/mpstat.c
@@ -119,12 +119,6 @@ enum {
119	};	119	};
120		120
121		121
122	/* Does str start with "cpu"? */
123	static int starts_with_cpu(const char *str)
124	{
125	return !((str[0] - 'c') \| (str[1] - 'p') \| (str[2] - 'u'));
126	}
127
128	/* Is option on? */	122	/* Is option on? */
129	static ALWAYS_INLINE int display_opt(int opt)	123	static ALWAYS_INLINE int display_opt(int opt)
130	{	124	{
@@ -816,38 +810,6 @@ static void print_header(struct tm *t)
816	}	810	}
817		811
818	/*	812	/*
819	* Get number of processors in /proc/stat
820	* Return value '0' means one CPU and non SMP kernel.
821	* Otherwise N means N processor(s) and SMP kernel.
822	*/
823	static int get_cpu_nr(void)
824	{
825	FILE *fp;
826	char line[256];
827	int proc_nr = -1;
828
829	fp = xfopen_for_read(PROCFS_STAT);
830	while (fgets(line, sizeof(line), fp)) {
831	if (!starts_with_cpu(line)) {
832	if (proc_nr >= 0)
833	break; /* we are past "cpuN..." lines */
834	continue;
835	}
836	if (line[3] != ' ') { /* "cpuN" */
837	int num_proc;
838	if (sscanf(line + 3, "%u", &num_proc) == 1
839	&& num_proc > proc_nr
840	) {
841	proc_nr = num_proc;
842	}
843	}
844	}
845
846	fclose(fp);
847	return proc_nr + 1;
848	}
849
850	/*
851	* Get number of interrupts available per processor	813	* Get number of interrupts available per processor
852	*/	814	*/
853	static int get_irqcpu_nr(const char *f, int max_irqs)	815	static int get_irqcpu_nr(const char *f, int max_irqs)
@@ -910,7 +872,7 @@ int mpstat_main(int UNUSED_PARAM argc, char **argv)
910	G.interval = -1;	872	G.interval = -1;
911		873
912	/* Get number of processors */	874	/* Get number of processors */
913	G.cpu_nr = get_cpu_nr();	875	G.cpu_nr = get_cpu_count();
914		876
915	/* Get number of clock ticks per sec */	877	/* Get number of clock ticks per sec */
916	G.hz = get_hz();	878	G.hz = get_hz();