projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: fix compile warning on platforms where pfds->fd is not an int
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 965d7d9c7a4c0804396e91c149a3165381b7bff7..e7d5c27c8420de2fae7b25ed784e96e61336869e 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-39,6
+39,7
@@
#include "server.h"
#include "stat.h"
#include "flow.h"
#include "server.h"
#include "stat.h"
#include "flow.h"
+#include "io_u_queue.h"
#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
@@
-81,7
+82,9
@@
enum {
FIO_RAND_FILE_SIZE_OFF,
FIO_RAND_TRIM_OFF,
FIO_RAND_BUF_OFF,
FIO_RAND_FILE_SIZE_OFF,
FIO_RAND_TRIM_OFF,
FIO_RAND_BUF_OFF,
- FIO_RAND_SEQ_RAND_OFF,
+ FIO_RAND_SEQ_RAND_READ_OFF,
+ FIO_RAND_SEQ_RAND_WRITE_OFF,
+ FIO_RAND_SEQ_RAND_TRIM_OFF,
FIO_RAND_NR_OFFS,
};
FIO_RAND_NR_OFFS,
};
@@
-193,9
+196,9
@@
struct thread_data {
/*
* List of free and busy io_u's
*/
/*
* List of free and busy io_u's
*/
- struct
flist_head io_u_freelist
;
- struct
flist_head io_u_busy
list;
- struct
flist_head io_u_requeues
;
+ struct
io_u_ring io_u_requeues
;
+ struct
io_u_queue io_u_free
list;
+ struct
io_u_queue io_u_all
;
pthread_mutex_t io_u_lock;
pthread_cond_t free_cond;
pthread_mutex_t io_u_lock;
pthread_cond_t free_cond;
@@
-260,8
+263,8
@@
struct thread_data {
* rand/seq mixed workload state
*/
union {
* rand/seq mixed workload state
*/
union {
- os_random_state_t seq_rand_state;
- struct frand_state __seq_rand_state;
+ os_random_state_t seq_rand_state
[DDIR_RWDIR_CNT]
;
+ struct frand_state __seq_rand_state
[DDIR_RWDIR_CNT]
;
};
/*
};
/*