Add gettid() for proper thread affinity on Linux

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index c8f517b6edc8c8199f1451afbdaf524bc1d926c2..cd2bb523bb9ef931f27ea123c3e239bcdc035518 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -2,7 +2,9 @@
 #define FIO_OS_H
 
 #include <sys/types.h>
+#include <pthread.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #if defined(__linux__)
 #include "os-linux.h"
@@ -16,6 +18,10 @@
 #include "os-mac.h"
 #elif defined(_AIX)
 #include "os-aix.h"
+#elif defined(__hpux)
+#include "os-hpux.h"
+#elif defined(__CYGWIN__)
+#include "os-windows.h"
 #else
 #error "unsupported os"
 #endif
@@ -42,7 +48,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)
@@ -88,10 +94,24 @@ 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
 
+#ifndef FIO_PREFERRED_ENGINE
+#define FIO_PREFERRED_ENGINE   "sync"
+#endif
+
+#ifndef FIO_MAX_JOBS
+#define FIO_MAX_JOBS           2048
+#endif
+
 #ifndef FIO_HAVE_BLKTRACE
 static inline int is_blktrace(const char *fname)
 {
@@ -121,13 +141,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;
 
@@ -160,4 +180,18 @@ static inline unsigned long long get_fs_size(const char *path)
 }
 #endif
 
+#ifndef FIO_HAVE_CPU_ONLINE_SYSCONF
+static inline unsigned int cpus_online(void)
+{
+       return sysconf(_SC_NPROCESSORS_ONLN);
+}
+#endif
+
+#ifndef FIO_HAVE_GETTID
+static inline int gettid(void)
+{
+       return getpid();
+}
+#endif
+
 #endif