diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-17 19:09:05 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-17 19:09:05 +0000 |
commit | 459be35234cc24b69309eb0ee22600024c73713e (patch) | |
tree | 15ac4122d9c42ec75ba68d342827e37fcb1306ed /libbb | |
parent | e79dd06782175d50f639180cde5b2c56933aa2ee (diff) | |
download | busybox-w32-459be35234cc24b69309eb0ee22600024c73713e.tar.gz busybox-w32-459be35234cc24b69309eb0ee22600024c73713e.tar.bz2 busybox-w32-459be35234cc24b69309eb0ee22600024c73713e.zip |
hwclock: size optimizations
libbb/time.c: new file, introducing monotonic_us()
pscan, traceroute, arping: use it instead of gettimeofday
ping, zcip: TODO
function old new delta
monotonic_us - 89 +89
find_pair 164 180 +16
.rodata 129747 129763 +16
refresh 1144 1152 +8
............
timeout 8 4 -4
static.start 8 4 -4
last 8 4 -4
parse_conf 1303 1284 -19
time_main 1149 1124 -25
gettimeofday_us 39 - -39
arping_main 2042 1969 -73
hwclock_main 594 501 -93
catcher 485 380 -105
traceroute_main 4300 4117 -183
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 8/11 up/down: 157/-562) Total: -405 bytes
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/Config.in | 10 | ||||
-rw-r--r-- | libbb/Kbuild | 1 | ||||
-rw-r--r-- | libbb/time.c | 32 |
3 files changed, 43 insertions, 0 deletions
diff --git a/libbb/Config.in b/libbb/Config.in index a1ff7c056..0a3769df2 100644 --- a/libbb/Config.in +++ b/libbb/Config.in | |||
@@ -95,4 +95,14 @@ config FEATURE_EDITING_FANCY_PROMPT | |||
95 | Setting this option allows for prompts to use things like \w and | 95 | Setting this option allows for prompts to use things like \w and |
96 | \$ and escape codes. | 96 | \$ and escape codes. |
97 | 97 | ||
98 | config MONOTONIC_SYSCALL | ||
99 | bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" | ||
100 | default y | ||
101 | help | ||
102 | Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring | ||
103 | time intervals (time, ping, traceroute etc need this). | ||
104 | Probably requires Linux 2.6+. If not selected, gettimeofday | ||
105 | will be used instead (which gives wrong results if date/time | ||
106 | is reset). | ||
107 | |||
98 | endmenu | 108 | endmenu |
diff --git a/libbb/Kbuild b/libbb/Kbuild index e562f3222..693f6092c 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild | |||
@@ -78,6 +78,7 @@ lib-y += simplify_path.o | |||
78 | lib-y += skip_whitespace.o | 78 | lib-y += skip_whitespace.o |
79 | lib-y += speed_table.o | 79 | lib-y += speed_table.o |
80 | lib-y += str_tolower.o | 80 | lib-y += str_tolower.o |
81 | lib-y += time.o | ||
81 | lib-y += trim.o | 82 | lib-y += trim.o |
82 | lib-y += u_signal_names.o | 83 | lib-y += u_signal_names.o |
83 | lib-y += udp_io.o | 84 | lib-y += udp_io.o |
diff --git a/libbb/time.c b/libbb/time.c new file mode 100644 index 000000000..f2a741521 --- /dev/null +++ b/libbb/time.c | |||
@@ -0,0 +1,32 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 2007 Denis Vlasenko | ||
6 | * | ||
7 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. | ||
8 | */ | ||
9 | |||
10 | #include "libbb.h" | ||
11 | |||
12 | #if ENABLE_MONOTONIC_SYSCALL | ||
13 | #include <sys/syscall.h> | ||
14 | |||
15 | /* libc has incredibly messy way of doing this, | ||
16 | * typically requiring -lrt. We just skip all this mess */ | ||
17 | unsigned long long monotonic_us(void) | ||
18 | { | ||
19 | struct timespec ts; | ||
20 | if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &ts)) | ||
21 | bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); | ||
22 | return ts.tv_sec * 1000000ULL + ts.tv_nsec/1000; | ||
23 | } | ||
24 | #else | ||
25 | unsigned long long monotonic_us(void) | ||
26 | { | ||
27 | struct timeval tv; | ||
28 | if (gettimeofday(&tv, NULL)) | ||
29 | bb_error_msg_and_die("gettimeofday failed"); | ||
30 | return tv.tv_sec * 1000000ULL + tv_usec; | ||
31 | } | ||
32 | #endif | ||