5d2e409ef
Bartosz Golaszewski
2014-06-22
Subject
libbb: use a wrapper around sysconf(_SC_CLK_TCK) to save a few bytes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h +1 -0libbb/sysconf.c +6 -0networking/libiproute/iproute.c +1 -1networking/route.c +1 -1procps/iostat.c +1 -6procps/mpstat.c +1 -7shell/ash.c +1 -1
include/libbb.h+1 -0
| @@ -738,6 +738,7 @@ unsigned bb_arg_max(void) FAST_FUNC; | |
| #else | |
| # define bb_arg_max() ((unsigned)(32 * 1024)) | |
| #endif | |
| + | unsigned bb_clk_tck(void) FAST_FUNC; |
| #define SEAMLESS_COMPRESSION (0 \ | |
| || ENABLE_FEATURE_SEAMLESS_XZ \ | |
libbb/sysconf.c+6 -0
| @@ -14,3 +14,9 @@ unsigned FAST_FUNC bb_arg_max(void) | |
| return sysconf(_SC_ARG_MAX); | |
| } | |
| #endif | |
| + | |
| + | /* Return the number of clock ticks per second. */ |
| + | unsigned FAST_FUNC bb_clk_tck(void) |
| + | { |
| + | return sysconf(_SC_CLK_TCK); |
| + | } |
networking/libiproute/iproute.c+1 -1
| @@ -73,7 +73,7 @@ static unsigned get_hz(void) | |
| fclose(fp); | |
| } | |
| if (!hz_internal) | |
| - | hz_internal = sysconf(_SC_CLK_TCK); |
| + | hz_internal = bb_clk_tck(); |
| return hz_internal; | |
| } | |
networking/route.c+1 -1
| @@ -283,7 +283,7 @@ static NOINLINE void INET_setroute(int action, char **args) | |
| if (k == KW_IPVx_IRTT) { | |
| rt->rt_flags |= RTF_IRTT; | |
| rt->rt_irtt = xatoul(args_m1); | |
| - | rt->rt_irtt *= (sysconf(_SC_CLK_TCK) / 100); /* FIXME */ |
| + | rt->rt_irtt *= (bb_clk_tck() / 100); /* FIXME */ |
| #if 0 /* FIXME: do we need to check anything of this? */ | |
| if (rt->rt_irtt < 1 || rt->rt_irtt > (120 * HZ)) { | |
| bb_error_msg_and_die("bad irtt"); | |
procps/iostat.c+1 -6
| @@ -109,11 +109,6 @@ enum { | |
| OPT_m = 1 << 5, | |
| }; | |
| - | static ALWAYS_INLINE unsigned get_user_hz(void) |
| - | { |
| - | return sysconf(_SC_CLK_TCK); |
| - | } |
| - | |
| static ALWAYS_INLINE int this_is_smp(void) | |
| { | |
| return (G.total_cpus > 1); | |
| @@ -414,7 +409,7 @@ int iostat_main(int argc UNUSED_PARAM, char **argv) | |
| memset(&stats_data, 0, sizeof(stats_data)); | |
| /* Get number of clock ticks per sec */ | |
| - | G.clk_tck = get_user_hz(); |
| + | G.clk_tck = bb_clk_tck(); |
| /* Determine number of CPUs */ | |
| G.total_cpus = get_cpu_count(); | |
procps/mpstat.c+1 -7
| @@ -775,12 +775,6 @@ static void main_loop(void) | |
| /* Initialization */ | |
| - | /* Get number of clock ticks per sec */ |
| - | static ALWAYS_INLINE unsigned get_hz(void) |
| - | { |
| - | return sysconf(_SC_CLK_TCK); |
| - | } |
| - | |
| static void alloc_struct(int cpus) | |
| { | |
| int i; | |
| @@ -873,7 +867,7 @@ int mpstat_main(int UNUSED_PARAM argc, char **argv) | |
| G.cpu_nr = get_cpu_count(); | |
| /* Get number of clock ticks per sec */ | |
| - | G.hz = get_hz(); |
| + | G.hz = bb_clk_tck(); |
| /* Calculate number of interrupts per processor */ | |
| G.irqcpu_nr = get_irqcpu_nr(PROCFS_INTERRUPTS, NR_IRQS) + NR_IRQCPU_PREALLOC; | |
shell/ash.c+1 -1
| @@ -12759,7 +12759,7 @@ timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| const unsigned char *p; | |
| struct tms buf; | |
| - | clk_tck = sysconf(_SC_CLK_TCK); |
| + | clk_tck = bb_clk_tck(); |
| times(&buf); | |
| p = timescmd_str; | |