ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-21 05:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

try regression fix

Browse Source
This commit is contained in:
vanhauser-thc
2024-06-01 12:26:26 +02:00
parent e13dc9b7e6
commit 894339c5d7
1 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/afl-common.c
View File

@ -59,27 +59,6 @@ u8 last_intr = 0;
#define AFL_PATH "/usr/local/lib/afl/" #define AFL_PATH "/usr/local/lib/afl/"
#endif #endif
/* - Some BSD (i.e.: FreeBSD) offer the FAST clock source as
* equivalent to Linux COARSE clock source. Aliasing COARSE to
* FAST on such systems when COARSE is not already defined.
* - macOS has no support of CLOCK_MONOTONIC_COARSE clock type.
*/
#if defined(OS_DARWIN) || defined(OS_SUNOS) || defined(__APPLE__) || \
defined(__sun) || defined(__NetBSD__)
#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
#elif defined(OS_FREEBSD)
#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST
#endif
/* Convert seconds to milliseconds. */
#define SEC_TO_MS(sec) ((sec) * 1000)
/* Convert seconds to microseconds. */
#define SEC_TO_US(sec) ((sec) * 1000000)
/* Convert nanoseconds to milliseconds. */
#define NS_TO_MS(ns) ((ns) / 1000000)
/* Convert nanoseconds to microseconds. */
#define NS_TO_US(ns) ((ns) / 1000)
void *afl_memmem(const void *haystack, size_t haystacklen, const void *needle, void *afl_memmem(const void *haystack, size_t haystacklen, const void *needle,
size_t needlelen) { size_t needlelen) {
@ -997,16 +976,12 @@ void read_bitmap(u8 *fname, u8 *map, size_t len) {
inline u64 get_cur_time(void) { inline u64 get_cur_time(void) {
struct timespec ts; struct timeval tv;
int rc = clock_gettime(CLOCK_MONOTONIC_COARSE, &ts); struct timezone tz;
if (unlikely(rc == -1)) {
PFATAL("Failed to obtain timestamp (errno = %i: %s)\n", errno, gettimeofday(&tv, &tz);
strerror(errno));
} return (tv.tv_sec * 1000ULL) + (tv.tv_usec / 1000);
return SEC_TO_MS((uint64_t)ts.tv_sec) + NS_TO_MS((uint64_t)ts.tv_nsec);
} }
@ -1014,16 +989,12 @@ inline u64 get_cur_time(void) {
inline u64 get_cur_time_us(void) { inline u64 get_cur_time_us(void) {
struct timespec ts; struct timeval tv;
int rc = clock_gettime(CLOCK_MONOTONIC_COARSE, &ts); struct timezone tz;
if (unlikely(rc == -1)) {
PFATAL("Failed to obtain timestamp (errno = %i: %s)\n", errno, gettimeofday(&tv, &tz);
strerror(errno));
} return (tv.tv_sec * 1000000ULL) + tv.tv_usec;
return SEC_TO_US((uint64_t)ts.tv_sec) + NS_TO_US((uint64_t)ts.tv_nsec);
} }