projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in smalloc size calculation
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index 95f0ff29e02fad0b8f7ed07b1f1e451c8bbeb1ae..cd2bb523bb9ef931f27ea123c3e239bcdc035518 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-4,6
+4,7
@@
#include <sys/types.h>
#include <pthread.h>
#include <unistd.h>
#include <sys/types.h>
#include <pthread.h>
#include <unistd.h>
+#include <stdlib.h>
#if defined(__linux__)
#include "os-linux.h"
#if defined(__linux__)
#include "os-linux.h"
@@
-17,6
+18,8
@@
#include "os-mac.h"
#elif defined(_AIX)
#include "os-aix.h"
#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
#elif defined(__CYGWIN__)
#include "os-windows.h"
#else
@@
-45,7
+48,7
@@
#endif
#ifndef FIO_HAVE_FADVISE
#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)
#ifndef POSIX_FADV_DONTNEED
#define POSIX_FADV_DONTNEED (0)
@@
-91,10
+94,24
@@
typedef unsigned long os_cpu_mask_t;
#define OS_RAND_MAX RAND_MAX
#endif
#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_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)
{
#ifndef FIO_HAVE_BLKTRACE
static inline int is_blktrace(const char *fname)
{
@@
-124,13
+141,13
@@
static inline int os_cache_line_size(void)
}
#ifdef FIO_USE_GENERIC_BDEV_SIZE
}
#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;
{
off_t end;
*bytes = 0;
- end = lseek(fd, 0, SEEK_END);
+ end = lseek(f
->f
d, 0, SEEK_END);
if (end < 0)
return errno;
if (end < 0)
return errno;
@@
-163,4
+180,18
@@
static inline unsigned long long get_fs_size(const char *path)
}
#endif
}
#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
#endif