diff options
| author | Denis Vlasenko | 2007-06-17 19:09:05 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-06-17 19:09:05 +0000 |
| commit | 459be35234cc24b69309eb0ee22600024c73713e (patch) | |
| tree | 15ac4122d9c42ec75ba68d342827e37fcb1306ed /libbb | |
| parent | e79dd06782175d50f639180cde5b2c56933aa2ee (diff) | |
| download | busybox-459be35234cc24b69309eb0ee22600024c73713e.zip busybox-459be35234cc24b69309eb0ee22600024c73713e.tar.gz | |
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 a1ff7c0..0a3769d 100644 --- a/libbb/Config.in +++ b/libbb/Config.in @@ -95,4 +95,14 @@ config FEATURE_EDITING_FANCY_PROMPT Setting this option allows for prompts to use things like \w and \$ and escape codes. +config MONOTONIC_SYSCALL + bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" + default y + help + Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring + time intervals (time, ping, traceroute etc need this). + Probably requires Linux 2.6+. If not selected, gettimeofday + will be used instead (which gives wrong results if date/time + is reset). + endmenu diff --git a/libbb/Kbuild b/libbb/Kbuild index e562f32..693f609 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -78,6 +78,7 @@ lib-y += simplify_path.o lib-y += skip_whitespace.o lib-y += speed_table.o lib-y += str_tolower.o +lib-y += time.o lib-y += trim.o lib-y += u_signal_names.o lib-y += udp_io.o diff --git a/libbb/time.c b/libbb/time.c new file mode 100644 index 0000000..f2a7415 --- /dev/null +++ b/libbb/time.c @@ -0,0 +1,32 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) 2007 Denis Vlasenko + * + * Licensed under GPL version 2, see file LICENSE in this tarball for details. + */ + +#include "libbb.h" + +#if ENABLE_MONOTONIC_SYSCALL +#include <sys/syscall.h> + +/* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ +unsigned long long monotonic_us(void) +{ + struct timespec ts; + if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + return ts.tv_sec * 1000000ULL + ts.tv_nsec/1000; +} +#else +unsigned long long monotonic_us(void) +{ + struct timeval tv; + if (gettimeofday(&tv, NULL)) + bb_error_msg_and_die("gettimeofday failed"); + return tv.tv_sec * 1000000ULL + tv_usec; +} +#endif |