projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug with probing block size
[fio.git]
/
os
/
os-solaris.h
diff --git
a/os/os-solaris.h
b/os/os-solaris.h
index b58d1308efc49e4bd1cf0d530256f90e9e076afd..f8ce1f31cf3d4b610f898b9da3eedc873190257d 100644
(file)
--- a/
os/os-solaris.h
+++ b/
os/os-solaris.h
@@
-2,6
+2,7
@@
#define FIO_OS_SOLARIS_H
#include <errno.h>
#define FIO_OS_SOLARIS_H
#include <errno.h>
+#include <malloc.h>
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/pset.h>
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/pset.h>
@@
-12,6
+13,8
@@
#define FIO_HAVE_POSIXAIO_FSYNC
#define FIO_HAVE_CPU_AFFINITY
#define FIO_HAVE_PSHARED_MUTEX
#define FIO_HAVE_POSIXAIO_FSYNC
#define FIO_HAVE_CPU_AFFINITY
#define FIO_HAVE_PSHARED_MUTEX
+#define FIO_USE_GENERIC_BDEV_SIZE
+#define FIO_HAVE_FDATASYNC
#define OS_MAP_ANON MAP_ANON
#define OS_RAND_MAX 2147483648UL
#define OS_MAP_ANON MAP_ANON
#define OS_RAND_MAX 2147483648UL
@@
-23,14
+26,6
@@
struct solaris_rand_seed {
typedef psetid_t os_cpu_mask_t;
typedef struct solaris_rand_seed os_random_state_t;
typedef psetid_t os_cpu_mask_t;
typedef struct solaris_rand_seed os_random_state_t;
-/*
- * FIXME
- */
-static inline int blockdev_size(int fd, unsigned long long *bytes)
-{
- return EINVAL;
-}
-
static inline int blockdev_invalidate_cache(int fd)
{
return EINVAL;
static inline int blockdev_invalidate_cache(int fd)
{
return EINVAL;
@@
-69,8
+64,8
@@
static inline int fio_set_odirect(int fd)
/*
* pset binding hooks for fio
*/
/*
* pset binding hooks for fio
*/
-#define fio_setaffinity(
td)
\
- pset_bind((
td)->o.cpumask, P_PID, (td)->pid
, NULL)
+#define fio_setaffinity(
pid, cpumask)
\
+ pset_bind((
cpumask), P_PID, (pid)
, NULL)
#define fio_getaffinity(pid, ptr) ({ 0; })
#define fio_cpu_clear(mask, cpu) pset_assign(PS_NONE, (cpu), NULL)
#define fio_getaffinity(pid, ptr) ({ 0; })
#define fio_cpu_clear(mask, cpu) pset_assign(PS_NONE, (cpu), NULL)
@@
-105,4
+100,8
@@
static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
*/
#define FIO_MAX_CPUS 16384
*/
#define FIO_MAX_CPUS 16384
+#ifdef MADV_FREE
+#define FIO_MADV_FREE MADV_FREE
+#endif
+
#endif
#endif