One step closer to group reporting

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index f2366c4c9a946ed6e0e2bcac06f551b936890010..d1d02b038015c247e7df06f05246db7e7fdf77ed 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -34,7 +34,7 @@ enum td_ddir {
        TD_DDIR_RAND            = 1 << 2,
        TD_DDIR_RW              = TD_DDIR_READ | TD_DDIR_WRITE,
        TD_DDIR_RANDREAD        = TD_DDIR_READ | TD_DDIR_RAND,
-       TD_DDIR_RANDWRITE       = TD_DDIR_WRITE | TD_DDIR_READ,
+       TD_DDIR_RANDWRITE       = TD_DDIR_WRITE | TD_DDIR_RAND,
        TD_DDIR_RANDRW          = TD_DDIR_RW | TD_DDIR_RAND,
 };
 
@@ -81,8 +81,9 @@ struct io_piece {
 
 #ifdef FIO_HAVE_SYSLET
 struct syslet_req {
-       struct syslet_uatom atom;
-       long ret;
+       struct syslet_uatom atom;       /* the atom to submit */
+       struct syslet_uatom *head;      /* head of the sequence */
+       long ret;                       /* syscall return value */
 };
 #endif
 
@@ -213,8 +214,8 @@ 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 */
 };
 
 /*
@@ -247,6 +248,12 @@ struct fio_file {
        unsigned int unlink;
 };
 
+/*
+ * How many depth levels to log
+ */
+#define FIO_IO_U_MAP_NR        8
+#define FIO_IO_U_LAT_NR 12
+
 struct thread_stat {
        struct io_log *slat_log;
        struct io_log *clat_log;
@@ -270,13 +277,14 @@ struct thread_stat {
        unsigned long usr_time;
        unsigned long sys_time;
        unsigned long ctx;
-};
 
-/*
- * How many depth levels to log
- */
-#define FIO_IO_U_MAP_NR        8
-#define FIO_IO_U_LAT_NR 12
+       /*
+        * IO depth and latency stats
+        */
+       unsigned int io_u_map[FIO_IO_U_MAP_NR];
+       unsigned int io_u_lat[FIO_IO_U_LAT_NR];
+       unsigned long total_io_u;
+};
 
 /*
  * This describes a single thread/process executing a fio job.
@@ -287,14 +295,16 @@ struct thread_data {
        char *name;
        char *directory;
        char *filename;
-       char verror[80];
+       char verror[128];
        pthread_t thread;
        int thread_number;
        int groupid;
-       struct thread_stat ts;
+       struct thread_stat *ts;
+       struct thread_stat __ts;
        enum fio_filetype filetype;
        struct fio_file *files;
        unsigned int nr_files;
+       unsigned int nr_open_files;
        unsigned int nr_uniq_files;
        union {
                unsigned int next_file;
@@ -350,6 +360,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;
@@ -358,6 +369,7 @@ struct thread_data {
        unsigned int rwmixwrite;
        unsigned int nice;
        unsigned int file_service_type;
+       unsigned int group_reporting;
 
        char *read_iolog_file;
        char *write_iolog_file;
@@ -382,12 +394,10 @@ struct thread_data {
         * Current IO depth and list of free and busy io_u's.
         */
        unsigned int cur_depth;
-       unsigned int io_u_map[FIO_IO_U_MAP_NR];
-       unsigned int io_u_lat[FIO_IO_U_LAT_NR];
-       unsigned long total_io_u;
        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
@@ -615,6 +625,8 @@ extern int __must_check init_random_state(struct thread_data *);
 extern void close_files(struct thread_data *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check open_files(struct thread_data *);
+extern int open_file(struct thread_data *, struct fio_file *, int, int);
+extern void close_file(struct thread_data *, struct fio_file *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
 
 /*
@@ -666,6 +678,7 @@ extern void requeue_io_u(struct thread_data *, struct io_u **);
 extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *);
 extern long __must_check io_u_queued_complete(struct thread_data *, int);
 extern void io_u_queued(struct thread_data *, struct io_u *);
+extern void io_u_log_error(struct thread_data *, struct io_u *);
 extern void io_u_init_timeout(void);
 extern void io_u_set_timeout(struct thread_data *);
 
@@ -712,6 +725,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];