projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/Nikratio/fio
[fio.git]
/
io_u.h
diff --git
a/io_u.h
b/io_u.h
index 311009287403f8254e6d922c9658a72b1f80ae29..bdbac52577afeff573e6895621dccc903acc1d0a 100644
(file)
--- a/
io_u.h
+++ b/
io_u.h
@@
-11,9
+11,6
@@
#ifdef CONFIG_LIBAIO
#include <libaio.h>
#endif
#ifdef CONFIG_LIBAIO
#include <libaio.h>
#endif
-#ifdef CONFIG_GUASI
-#include <guasi.h>
-#endif
enum {
IO_U_F_FREE = 1 << 0,
enum {
IO_U_F_FREE = 1 << 0,
@@
-24,7
+21,7
@@
enum {
IO_U_F_TRIMMED = 1 << 5,
IO_U_F_BARRIER = 1 << 6,
IO_U_F_VER_LIST = 1 << 7,
IO_U_F_TRIMMED = 1 << 5,
IO_U_F_BARRIER = 1 << 6,
IO_U_F_VER_LIST = 1 << 7,
- IO_U_F_
PRIORITY
= 1 << 8,
+ IO_U_F_
HIGH_PRIO
= 1 << 8,
};
/*
};
/*
@@
-49,6
+46,11
@@
struct io_u {
*/
unsigned short numberio;
*/
unsigned short numberio;
+ /*
+ * IO priority.
+ */
+ unsigned short ioprio;
+
/*
* Allocated/set buffer and length
*/
/*
* Allocated/set buffer and length
*/
@@
-101,13
+103,14
@@
struct io_u {
* @success == true means that the I/O operation has been queued or
* completed successfully.
*/
* @success == true means that the I/O operation has been queued or
* completed successfully.
*/
- void (*zbd_queue_io)(struct io_u *, int q, bool success);
+ void (*zbd_queue_io)(struct thread_data *td, struct io_u *, int q,
+ bool success);
/*
* ZBD mode zbd_put_io callback: called in after completion of an I/O
* or commit of an async I/O to unlock the I/O target zone.
*/
/*
* ZBD mode zbd_put_io callback: called in after completion of an I/O
* or commit of an async I/O to unlock the I/O target zone.
*/
- void (*zbd_put_io)(const struct io_u *);
+ void (*zbd_put_io)(
struct thread_data *td,
const struct io_u *);
/*
* Callback for io completion
/*
* Callback for io completion
@@
-124,9
+127,6
@@
struct io_u {
#ifdef FIO_HAVE_SGIO
struct sg_io_hdr hdr;
#endif
#ifdef FIO_HAVE_SGIO
struct sg_io_hdr hdr;
#endif
-#ifdef CONFIG_GUASI
- guasi_req_t greq;
-#endif
#ifdef CONFIG_SOLARISAIO
aio_result_t resultp;
#endif
#ifdef CONFIG_SOLARISAIO
aio_result_t resultp;
#endif
@@
-193,7
+193,6
@@
static inline enum fio_ddir acct_ddir(struct io_u *io_u)
td_flags_clear((td), &(io_u->flags), (val))
#define io_u_set(td, io_u, val) \
td_flags_set((td), &(io_u)->flags, (val))
td_flags_clear((td), &(io_u->flags), (val))
#define io_u_set(td, io_u, val) \
td_flags_set((td), &(io_u)->flags, (val))
-#define io_u_is_prio(io_u) \
- (io_u->flags & (unsigned int) IO_U_F_PRIORITY) != 0
+#define io_u_is_high_prio(io_u) (io_u->flags & IO_U_F_HIGH_PRIO)
#endif
#endif