From 09164e5a3b3820a9ab7aaf2abc3be2579ae06a1c Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 29 Nov 2012 21:27:20 +0100 Subject: [PATCH 1/1] Wire up _weak posix_fadvise() The commit adding Android support included a botched variant of posix_fadvise(). Signed-off-by: Jens Axboe --- helpers.c | 7 +++++++ helpers.h | 1 + os/os.h | 11 ----------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/helpers.c b/helpers.c index 5be45ccf..1b4e1d0a 100644 --- a/helpers.c +++ b/helpers.c @@ -50,3 +50,10 @@ int _weak sync_file_range(int fd, off64_t offset, off64_t nbytes, return -1; } #endif + +#ifndef FIO_HAVE_FADVISE +int _weak posix_fadvise(int fd, off_t offset, off_t len, int advice) +{ + return 0; +} +#endif diff --git a/helpers.h b/helpers.h index ed2086d1..191096bd 100644 --- a/helpers.h +++ b/helpers.h @@ -15,5 +15,6 @@ extern int _weak inet_aton(const char *cp, struct in_addr *inp); extern int _weak clock_gettime(clockid_t clk_id, struct timespec *ts); extern int _weak sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags); +extern int _weak posix_fadvise(int fd, off_t offset, off_t len, int advice); #endif /* FIO_HELPERS_H_ */ diff --git a/os/os.h b/os/os.h index dd704647..2e4764e1 100644 --- a/os/os.h +++ b/os/os.h @@ -68,22 +68,11 @@ typedef struct aiocb os_aiocb_t; #define OS_MSG_DONTWAIT MSG_DONTWAIT #endif -#ifndef FIO_HAVE_FADVISE -static inline int posix_fadvise(int fd, int off, int len, int advice) -{ - (void)fd; - (void)off; - (void)len; - (void)advice; - return 0; -} - #ifndef POSIX_FADV_DONTNEED #define POSIX_FADV_DONTNEED (0) #define POSIX_FADV_SEQUENTIAL (0) #define POSIX_FADV_RANDOM (0) #endif -#endif /* FIO_HAVE_FADVISE */ #ifndef FIO_HAVE_CPU_AFFINITY #define fio_setaffinity(pid, mask) (0) -- 2.25.1