f2c8aa667
Denys Vlasenko
2010-01-12
Subject
libbb: introduce and use monotonic_ms
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h +1 -0libbb/time.c +12 -0miscutils/time.c +2 -2networking/udhcp/arpping.c +2 -2shell/ash.c +2 -2
include/libbb.h+1 -0
| @@ -249,6 +249,7 @@ extern int *const bb_errno; | |
| unsigned long long monotonic_ns(void) FAST_FUNC; | |
| unsigned long long monotonic_us(void) FAST_FUNC; | |
| + | unsigned long long monotonic_ms(void) FAST_FUNC; |
| unsigned monotonic_sec(void) FAST_FUNC; | |
| extern void chomp(char *s) FAST_FUNC; | |
libbb/time.c+12 -0
| @@ -175,6 +175,12 @@ unsigned long long FAST_FUNC monotonic_us(void) | |
| get_mono(&ts); | |
| return ts.tv_sec * 1000000ULL + ts.tv_nsec/1000; | |
| } | |
| + | unsigned long long FAST_FUNC monotonic_ms(void) |
| + | { |
| + | struct timespec ts; |
| + | get_mono(&ts); |
| + | return ts.tv_sec * 1000ULL + ts.tv_nsec/1000000; |
| + | } |
| unsigned FAST_FUNC monotonic_sec(void) | |
| { | |
| struct timespec ts; | |
| @@ -196,6 +202,12 @@ unsigned long long FAST_FUNC monotonic_us(void) | |
| gettimeofday(&tv, NULL); | |
| return tv.tv_sec * 1000000ULL + tv.tv_usec; | |
| } | |
| + | unsigned long long FAST_FUNC monotonic_ms(void) |
| + | { |
| + | struct timeval tv; |
| + | gettimeofday(&tv, NULL); |
| + | return tv.tv_sec * 1000ULL + tv.tv_usec / 1000; |
| + | } |
| unsigned FAST_FUNC monotonic_sec(void) | |
| { | |
| return time(NULL); | |
miscutils/time.c+2 -2
| @@ -70,7 +70,7 @@ static void resuse_end(pid_t pid, resource_t *resp) | |
| return; | |
| } | |
| } | |
| - | resp->elapsed_ms = (monotonic_us() / 1000) - resp->elapsed_ms; |
| + | resp->elapsed_ms = monotonic_ms() - resp->elapsed_ms; |
| } | |
| static void printargv(char *const *argv) | |
| @@ -371,7 +371,7 @@ static void run_command(char *const *cmd, resource_t *resp) | |
| void (*interrupt_signal)(int); | |
| void (*quit_signal)(int); | |
| - | resp->elapsed_ms = monotonic_us() / 1000; |
| + | resp->elapsed_ms = monotonic_ms(); |
| pid = vfork(); /* Run CMD as child process. */ | |
| if (pid < 0) | |
| bb_perror_msg_and_die("fork"); | |
networking/udhcp/arpping.c+2 -2
| @@ -88,7 +88,7 @@ int FAST_FUNC arpping(uint32_t test_nip, | |
| timeout_ms = 2000; | |
| do { | |
| int r; | |
| - | unsigned prevTime = monotonic_us(); |
| + | unsigned prevTime = monotonic_ms(); |
| pfd[0].events = POLLIN; | |
| r = safe_poll(pfd, 1, timeout_ms); | |
| @@ -119,7 +119,7 @@ int FAST_FUNC arpping(uint32_t test_nip, | |
| break; | |
| } | |
| } | |
| - | timeout_ms -= ((unsigned)monotonic_us() - prevTime) / 1000; |
| + | timeout_ms -= (unsigned)monotonic_ms() - prevTime; |
| } while (timeout_ms > 0); | |
| ret: | |
shell/ash.c+2 -2
| @@ -12619,7 +12619,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| backslash = 0; | |
| #if ENABLE_ASH_READ_TIMEOUT | |
| if (timeout) /* NB: ensuring end_ms is nonzero */ | |
| - | end_ms = ((unsigned)(monotonic_us() / 1000) + timeout) | 1; |
| + | end_ms = ((unsigned)monotonic_ms() + timeout) | 1; |
| #endif | |
| STARTSTACKSTR(p); | |
| do { | |
| @@ -12630,7 +12630,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| struct pollfd pfd[1]; | |
| pfd[0].fd = fd; | |
| pfd[0].events = POLLIN; | |
| - | timeout = end_ms - (unsigned)(monotonic_us() / 1000); |
| + | timeout = end_ms - (unsigned)monotonic_ms(); |
| if ((int)timeout <= 0 /* already late? */ | |
| || safe_poll(pfd, 1, timeout) != 1 /* no? wait... */ | |
| ) { /* timed out! */ | |