6a55b4e40
Denys Vlasenko
2020-11-29
Subject
libbb: introduce and use msleep()
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h +2 -1libbb/bb_do_delay.c +14 -1miscutils/beep.c +2 -2miscutils/watchdog.c +1 -1networking/traceroute.c +1 -1
include/libbb.h+2 -1
| @@ -1602,7 +1602,8 @@ char *bb_simplify_path(const char *path) FAST_FUNC; | |
| char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC; | |
| void pause_after_failed_login(void) FAST_FUNC; | |
| - | void bb_do_delay(int seconds) FAST_FUNC; |
| + | void bb_do_delay(unsigned seconds) FAST_FUNC; |
| + | void msleep(unsigned ms) FAST_FUNC; |
| void sleep1(void) FAST_FUNC; | |
| void change_identity(const struct passwd *pw) FAST_FUNC; | |
| void run_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC; | |
libbb/bb_do_delay.c+14 -1
| @@ -8,7 +8,7 @@ | |
| */ | |
| #include "libbb.h" | |
| - | /* void FAST_FUNC bb_do_delay(int seconds) { ... } - no users yet */ |
| + | /* void FAST_FUNC bb_do_delay(unsigned seconds) { ... } - no users yet */ |
| #ifndef LOGIN_FAIL_DELAY | |
| #define LOGIN_FAIL_DELAY 3 | |
| @@ -34,3 +34,16 @@ void FAST_FUNC sleep1(void) | |
| sleep(1); | |
| } | |
| + | void FAST_FUNC msleep(unsigned ms) |
| + | { |
| + | /* 1. usleep(n) is not guaranteed by standards to accept n >= 1000000 |
| + | * 2. multiplication in usleep(ms * 1000) can overflow if ms > 4294967 |
| + | * (sleep of ~71.5 minutes) |
| + | * Let's play safe and loop: |
| + | */ |
| + | while (ms > 500) { |
| + | usleep(500000); |
| + | ms -= 500; |
| + | } |
| + | usleep(ms * 1000); |
| + | } |
miscutils/beep.c+2 -2
| @@ -114,10 +114,10 @@ int beep_main(int argc, char **argv) | |
| while (rep) { | |
| //bb_error_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay); | |
| xioctl(speaker, KIOCSOUND, (void*)(uintptr_t)tickrate_div_freq); | |
| - | usleep(1000 * length); |
| + | msleep(length); |
| ioctl(speaker, KIOCSOUND, (void*)0); | |
| if (--rep) | |
| - | usleep(1000 * delay); |
| + | msleep(delay); |
| } | |
| } | |
miscutils/watchdog.c+1 -1
| @@ -143,7 +143,7 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv) | |
| * as the counter value is undefined at this point -- PFM | |
| */ | |
| write(3, "", 1); /* write zero byte */ | |
| - | usleep(stimer_duration * 1000L); |
| + | msleep(stimer_duration); |
| } | |
| return EXIT_SUCCESS; /* - not reached, but gcc 4.2.1 is too dumb! */ | |
| } | |
networking/traceroute.c+1 -1
| @@ -1071,7 +1071,7 @@ common_traceroute_main(int op, char **argv) | |
| fflush_all(); | |
| if (probe != 0 && pausemsecs > 0) | |
| - | usleep(pausemsecs * 1000); |
| + | msleep(pausemsecs); |
| send_probe(++seq, ttl); | |
| t2 = t1 = monotonic_us(); | |