projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix aiocb compile warnings on HPUX
[fio.git]
/
ioengine.h
diff --git
a/ioengine.h
b/ioengine.h
index 6190977d4170fd7632a710c5417ba5661d24ded7..044c4da1a150af8ce239cd0bc57ca14a75ef0c6a 100644
(file)
--- a/
ioengine.h
+++ b/
ioengine.h
@@
-1,11
+1,16
@@
#ifndef FIO_IOENGINE_H
#define FIO_IOENGINE_H
#ifndef FIO_IOENGINE_H
#define FIO_IOENGINE_H
-#define FIO_IOOPS_VERSION 1
0
+#define FIO_IOOPS_VERSION 1
2
enum {
enum {
- IO_U_F_FREE = 1 << 0,
- IO_U_F_FLIGHT = 1 << 1,
+ IO_U_F_FREE = 1 << 0,
+ IO_U_F_FLIGHT = 1 << 1,
+ IO_U_F_FREE_DEF = 1 << 2,
+ IO_U_F_IN_CUR_DEPTH = 1 << 3,
+ IO_U_F_BUSY_OK = 1 << 4,
+ IO_U_F_TRIMMED = 1 << 5,
+ IO_U_F_BARRIER = 1 << 6,
};
/*
};
/*
@@
-17,7
+22,7
@@
struct io_u {
struct iocb iocb;
#endif
#ifdef FIO_HAVE_POSIXAIO
struct iocb iocb;
#endif
#ifdef FIO_HAVE_POSIXAIO
-
struct aiocb
aiocb;
+
os_aiocb_t
aiocb;
#endif
#ifdef FIO_HAVE_SGIO
struct sg_io_hdr hdr;
#endif
#ifdef FIO_HAVE_SGIO
struct sg_io_hdr hdr;
@@
-27,6
+32,12
@@
struct io_u {
#endif
#ifdef FIO_HAVE_SOLARISAIO
aio_result_t resultp;
#endif
#ifdef FIO_HAVE_SOLARISAIO
aio_result_t resultp;
+#endif
+#ifdef FIO_HAVE_BINJECT
+ struct b_user_cmd buc;
+#endif
+#ifdef FIO_HAVE_RDMA
+ struct ibv_mr *mr;
#endif
void *mmap_data;
};
#endif
void *mmap_data;
};
@@
-40,6
+51,11
@@
struct io_u {
unsigned long buflen;
unsigned long long offset;
unsigned long buflen;
unsigned long long offset;
+ /*
+ * Initial seed for generating the buffer contents
+ */
+ unsigned long rand_seed;
+
/*
* IO engine state, may be different from above when we get
* partial transfers / residual data counts
/*
* IO engine state, may be different from above when we get
* partial transfers / residual data counts
@@
-47,6
+63,12
@@
struct io_u {
void *xfer_buf;
unsigned long xfer_buflen;
void *xfer_buf;
unsigned long xfer_buflen;
+ /*
+ * Parameter related to pre-filled buffers and
+ * their size to handle variable block sizes.
+ */
+ unsigned long buf_filled_len;
+
unsigned int resid;
unsigned int error;
unsigned int resid;
unsigned int error;
@@
-111,7
+133,10
@@
enum fio_ioengine_flags {
FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */
FIO_UNIDIR = 1 << 5, /* engine is uni-directional */
FIO_NOIO = 1 << 6, /* thread does only pseudo IO */
FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */
FIO_UNIDIR = 1 << 5, /* engine is uni-directional */
FIO_NOIO = 1 << 6, /* thread does only pseudo IO */
- FIO_SIGQUIT = 1 << 7, /* needs SIGQUIT to exit */
+ FIO_SIGTERM = 1 << 7, /* needs SIGTERM to exit */
+ FIO_PIPEIO = 1 << 8, /* input/output no seekable */
+ FIO_BARRIER = 1 << 9, /* engine supports barriers */
+ FIO_MEMALIGN = 1 << 10, /* engine wants aligned memory */
};
/*
};
/*
@@
-150,6
+175,9
@@
extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int
void io_u_mark_complete(struct thread_data *, unsigned int);
void io_u_mark_submit(struct thread_data *, unsigned int);
void io_u_mark_complete(struct thread_data *, unsigned int);
void io_u_mark_submit(struct thread_data *, unsigned int);
+int do_io_u_sync(struct thread_data *, struct io_u *);
+int do_io_u_trim(struct thread_data *, struct io_u *);
+
#ifdef FIO_INC_DEBUG
static inline void dprint_io_u(struct io_u *io_u, const char *p)
{
#ifdef FIO_INC_DEBUG
static inline void dprint_io_u(struct io_u *io_u, const char *p)
{