projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert change that set group_reporting to 1
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index fb544a173e4a2c03e56bc893b18f37d38205715b..4416ae482fb46a176cccf252bea8307dbc24b0c8 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-8,6
+8,8
@@
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
+#include "../arch/arch.h"
+
enum {
os_linux = 1,
os_aix,
enum {
os_linux = 1,
os_aix,
@@
-56,7
+58,7
@@
typedef struct aiocb os_aiocb_t;
#include <scsi/sg.h>
#endif
#include <scsi/sg.h>
#endif
-#ifdef CONFIG_STRSEP
+#if
n
def CONFIG_STRSEP
#include "../lib/strsep.h"
#endif
#include "../lib/strsep.h"
#endif
@@
-79,7
+81,7
@@
typedef unsigned long os_cpu_mask_t;
#endif
#ifndef FIO_HAVE_IOPRIO
#endif
#ifndef FIO_HAVE_IOPRIO
-#define ioprio_set(which, who, prio
)
(0)
+#define ioprio_set(which, who, prio
class, prio)
(0)
#endif
#ifndef FIO_HAVE_ODIRECT
#endif
#ifndef FIO_HAVE_ODIRECT
@@
-125,7
+127,11
@@
typedef unsigned long os_cpu_mask_t;
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
+#ifdef CONFIG_CLOCK_GETTIME
#define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME
#define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME
+#else
+#define FIO_PREFERRED_CLOCK_SOURCE CS_GTOD
+#endif
#endif
#ifndef FIO_MAX_JOBS
#endif
#ifndef FIO_MAX_JOBS
@@
-137,7
+143,7
@@
typedef unsigned int socklen_t;
#endif
#ifndef FIO_OS_HAS_CTIME_R
#endif
#ifndef FIO_OS_HAS_CTIME_R
-#define os_ctime_r(x, y, z) ctime_r((x), (y))
+#define os_ctime_r(x, y, z)
(void)
ctime_r((x), (y))
#endif
#ifdef FIO_USE_GENERIC_SWAP
#endif
#ifdef FIO_USE_GENERIC_SWAP