diff options
| author | Bruce Cran <bruce@cran.org.uk> | 2011-01-04 10:59:30 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-01-04 10:59:30 +0100 |
| commit | ecc314ba7c5f02b7e90ac1dfbce1a74cd4e6d6fe (patch) | |
| tree | 6ffdc338398b8426022d7e32a185db4ffb41d58f /os/os.h | |
| parent | 03e20d687566753b90383571e5e152c5142bdffd (diff) | |
| download | fio-ecc314ba7c5f02b7e90ac1dfbce1a74cd4e6d6fe.tar.gz fio-ecc314ba7c5f02b7e90ac1dfbce1a74cd4e6d6fe.tar.bz2 | |
FIO Windows update
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'os/os.h')
| -rw-r--r-- | os/os.h | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -4,6 +4,7 @@ #include <sys/types.h> #include <pthread.h> #include <unistd.h> +#include <stdlib.h> #if defined(__linux__) #include "os-linux.h" @@ -45,7 +46,7 @@ #endif #ifndef FIO_HAVE_FADVISE -#define fadvise(fd, off, len, advice) (0) +#define posix_fadvise(fd, off, len, advice) (0) #ifndef POSIX_FADV_DONTNEED #define POSIX_FADV_DONTNEED (0) @@ -91,6 +92,12 @@ typedef unsigned long os_cpu_mask_t; #define OS_RAND_MAX RAND_MAX #endif +#ifdef FIO_HAVE_CLOCK_MONOTONIC +#define FIO_TIMER_CLOCK CLOCK_MONOTONIC +#else +#define FIO_TIMER_CLOCK CLOCK_REALTIME +#endif + #ifndef FIO_HAVE_RAWBIND #define fio_lookup_raw(dev, majdev, mindev) 1 #endif @@ -124,13 +131,13 @@ static inline int os_cache_line_size(void) } #ifdef FIO_USE_GENERIC_BDEV_SIZE -static inline int blockdev_size(int fd, unsigned long long *bytes) +static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) { off_t end; *bytes = 0; - end = lseek(fd, 0, SEEK_END); + end = lseek(f->fd, 0, SEEK_END); if (end < 0) return errno; |