diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-12 12:52:30 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-12 12:52:30 +0100 |
commit | f2c8aa6676ebedc34b2cd5089ce6f13c16db1277 (patch) | |
tree | bc728f22666ee367d1c6c085a6cf65570881636c /shell | |
parent | cb23d93c6845df3f2733a32caa4194e60ef871a7 (diff) | |
download | busybox-w32-f2c8aa6676ebedc34b2cd5089ce6f13c16db1277.tar.gz busybox-w32-f2c8aa6676ebedc34b2cd5089ce6f13c16db1277.tar.bz2 busybox-w32-f2c8aa6676ebedc34b2cd5089ce6f13c16db1277.zip |
libbb: introduce and use monotonic_ms
function old new delta
monotonic_ms - 60 +60
process_stdin 433 443 +10
display_speed 85 90 +5
nmeter_main 672 674 +2
builtin_type 114 116 +2
bb__parsespent 117 119 +2
ifplugd_main 1110 1109 -1
acpid_main 441 440 -1
chat_main 1361 1359 -2
doCommands 2458 2449 -9
arpping 466 450 -16
run_command 268 234 -34
readcmd 1072 1034 -38
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 5/7 up/down: 81/-101) Total: -20 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index b47f0e881..e668f41e1 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -12619,7 +12619,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
12619 | backslash = 0; | 12619 | backslash = 0; |
12620 | #if ENABLE_ASH_READ_TIMEOUT | 12620 | #if ENABLE_ASH_READ_TIMEOUT |
12621 | if (timeout) /* NB: ensuring end_ms is nonzero */ | 12621 | if (timeout) /* NB: ensuring end_ms is nonzero */ |
12622 | end_ms = ((unsigned)(monotonic_us() / 1000) + timeout) | 1; | 12622 | end_ms = ((unsigned)monotonic_ms() + timeout) | 1; |
12623 | #endif | 12623 | #endif |
12624 | STARTSTACKSTR(p); | 12624 | STARTSTACKSTR(p); |
12625 | do { | 12625 | do { |
@@ -12630,7 +12630,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
12630 | struct pollfd pfd[1]; | 12630 | struct pollfd pfd[1]; |
12631 | pfd[0].fd = fd; | 12631 | pfd[0].fd = fd; |
12632 | pfd[0].events = POLLIN; | 12632 | pfd[0].events = POLLIN; |
12633 | timeout = end_ms - (unsigned)(monotonic_us() / 1000); | 12633 | timeout = end_ms - (unsigned)monotonic_ms(); |
12634 | if ((int)timeout <= 0 /* already late? */ | 12634 | if ((int)timeout <= 0 /* already late? */ |
12635 | || safe_poll(pfd, 1, timeout) != 1 /* no? wait... */ | 12635 | || safe_poll(pfd, 1, timeout) != 1 /* no? wait... */ |
12636 | ) { /* timed out! */ | 12636 | ) { /* timed out! */ |