diff options
| author | Dominik Maier <domenukk@gmail.com> | 2020-05-30 13:51:29 +0200 |
|---|---|---|
| committer | Dominik Maier <domenukk@gmail.com> | 2020-05-30 13:51:29 +0200 |
| commit | b16ccb481195d338b3b4a800965ba4054d268886 (patch) | |
| tree | bd2e7de2101d0e9fbd8b7f89b9e76dd302f47151 /src | |
| parent | 4119752f83cbd29f8cca010865423301f2820553 (diff) | |
| download | afl++-b16ccb481195d338b3b4a800965ba4054d268886.tar.gz | |
Revert "code format"
This reverts commit 8f19becb620a6fedd0f8b855b48cdeeab211c2ed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/afl-common.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/afl-common.c b/src/afl-common.c index b3933b9c..793041b2 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -880,6 +880,7 @@ void set_nonblocking(int fd) { } + /* Wrapper for select() and read(), reading exactly len bytes. Should be called on non-blocking fds. Returns the time passed to read. @@ -894,24 +895,24 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms, FD_ZERO(&readfds); FD_SET(fd, &readfds); - size_t read_total = 0; + size_t read_total = 0; ssize_t len_read = 0; -#if defined(__linux__) - timeout.tv_sec = (timeout_ms / 1000); - timeout.tv_usec = (timeout_ms % 1000) * 1000; -#else - u64 time_start = get_cur_time_us(); -#endif + #if defined(__linux__) + timeout.tv_sec = (timeout_ms / 1000); + timeout.tv_usec = (timeout_ms % 1000) * 1000; + #else + u64 time_start = get_cur_time_us(); + #endif while (read_total < len) { -#if !defined(__linux__) - u64 time_current = get_cur_time_us(); - u64 timeout_current = timeout_ms - (time_current - time_start); - timeout.tv_sec = (timeout_current / 1000); - timeout.tv_usec = (timeout_current % 1000) * 1000; -#endif + #if !defined(__linux__) + u64 time_current = get_cur_time_us(); + u64 timeout_current = timeout_ms - (time_current - time_start); + timeout.tv_sec = (timeout_current / 1000); + timeout.tv_usec = (timeout_current % 1000) * 1000; + #endif /* set exceptfds as well to return when a child exited/closed the pipe. */ int sret = select(fd + 1, &readfds, NULL, NULL, &timeout); @@ -935,13 +936,13 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms, } -#if defined(__linux__) - s32 exec_ms = + #if defined(__linux__) + s32 exec_ms = MIN(timeout_ms, ((u64)timeout_ms - (timeout.tv_sec * 1000 + timeout.tv_usec / 1000))); -#else - u32 exec_ms = get_cur_time_us() - time_start; -#endif + #else + u32 exec_ms = get_cur_time_us() - time_start; + #endif return exec_ms > 0 ? exec_ms : 1; // at least 1 milli must have passed (0 is an error) |