X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=e7d5c27c8420de2fae7b25ed784e96e61336869e;hp=965d7d9c7a4c0804396e91c149a3165381b7bff7;hb=65e1a120131f069fda859498ff4565a9b6e16dc2;hpb=211c9b8948b43ed47aedf1227e0444a58db015e4 diff --git a/fio.h b/fio.h index 965d7d9c..e7d5c27c 100644 --- a/fio.h +++ b/fio.h @@ -39,6 +39,7 @@ #include "server.h" #include "stat.h" #include "flow.h" +#include "io_u_queue.h" #ifdef CONFIG_SOLARISAIO #include @@ -81,7 +82,9 @@ enum { 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, }; @@ -193,9 +196,9 @@ struct thread_data { /* * List of free and busy io_u's */ - struct flist_head io_u_freelist; - struct flist_head io_u_busylist; - struct flist_head io_u_requeues; + struct io_u_ring io_u_requeues; + struct io_u_queue io_u_freelist; + struct io_u_queue io_u_all; pthread_mutex_t io_u_lock; pthread_cond_t free_cond; @@ -260,8 +263,8 @@ struct thread_data { * 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]; }; /*