[PATCH] ioengine flags: Replace FIO_NETIO with real flags that map the

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 57d1b6b995d28dee547e5c9dfeb4858a83e305de..f8f9a5e458cbe528cd8ef153e50d76da8c0e6193 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -214,8 +214,9 @@ enum fio_ioengine_flags {
        FIO_CPUIO       = 1 << 1,       /* cpu burner, doesn't do real io */
        FIO_MMAPIO      = 1 << 2,       /* uses memory mapped io */
        FIO_RAWIO       = 1 << 3,       /* some sort of direct/raw io */
-       FIO_NETIO       = 1 << 4,       /* networked io */
-       FIO_NULLIO      = 1 << 5,       /* no real data transfer (cpu/null) */
+       FIO_DISKLESSIO  = 1 << 4,       /* no disk involved */
+       FIO_SELFOPEN    = 1 << 5,       /* opens its own devices */
+       FIO_NULLIO      = 1 << 6,       /* no real data transfer (cpu/null) */
 };
 
 /*
@@ -351,6 +352,7 @@ struct thread_data {
        unsigned int numjobs;
        unsigned int iodepth;
        unsigned int iodepth_low;
+       unsigned int iodepth_batch;
        os_cpu_mask_t cpumask;
        unsigned int iolog;
        unsigned int read_iolog;
@@ -389,6 +391,7 @@ struct thread_data {
        struct list_head io_u_freelist;
        struct list_head io_u_busylist;
        struct list_head io_u_requeues;
+       unsigned int io_u_queued;
 
        /*
         * Rate state
@@ -713,6 +716,9 @@ static inline void fio_sem_up(volatile int *sem)
                fprintf(stderr, ##args);        \
        } while (0)
 
+FILE *get_f_out(void);
+FILE *get_f_err(void);
+
 struct ioengine_ops {
        struct list_head list;
        char name[16];