[PATCH] Change logging unit from MiB to KiB

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 37dabae1ec0af62c7718332706b0a9041336ae94..2541c1a0777507423334704cdd9d50204398b738 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -38,6 +38,7 @@ struct io_piece {
        struct list_head list;
        unsigned long long offset;
        unsigned int len;
+       int ddir;
 };
 
 /*
@@ -93,13 +94,13 @@ struct verify_header {
 struct group_run_stats {
        unsigned long long max_run[2], min_run[2];
        unsigned long long max_bw[2], min_bw[2];
-       unsigned long long io_mb[2];
+       unsigned long long io_kb[2];
        unsigned long long agg[2];
 };
 
 struct thread_data {
        char file_name[256];
-       char directory[256];
+       char *directory;
        char verror[80];
        pthread_t thread;
        int thread_number;
@@ -133,6 +134,7 @@ struct thread_data {
        unsigned int bw_avg_time;
        unsigned int create_serialize;
        unsigned int create_fsync;
+       unsigned int end_fsync;
        unsigned int loops;
        unsigned long long file_size;
        unsigned long long real_file_size;
@@ -148,6 +150,20 @@ struct thread_data {
        unsigned int iodepth;
        os_cpu_mask_t cpumask;
        unsigned int jobnum;
+       unsigned int iolog;
+       unsigned int read_iolog;
+       unsigned int write_iolog;
+       unsigned int rwmixcycle;
+       unsigned int rwmixread;
+       unsigned int nice;
+
+       char *iolog_file;
+       void *iolog_buf;
+       FILE *iolog_f;
+
+       char *sysfs_root;
+
+       char *ioscheduler;
 
        struct drand48_data bsrange_state;
        struct drand48_data verify_state;
@@ -217,7 +233,18 @@ struct thread_data {
        unsigned int do_disk_util;
        unsigned int override_sync;
 
+       struct drand48_data rwmix_state;
+       struct timeval rwmix_switch;
+       int rwmix_ddir;
+
+       /*
+        * Pre-run and post-run shell
+        */
+       char *exec_prerun;
+       char *exec_postrun;
+
        struct list_head io_hist_list;
+       struct list_head io_log_list;
 };
 
 #define td_verror(td, err)                                             \
@@ -273,6 +300,7 @@ enum {
        FIO_LIBAIO      = 1 << 2,
        FIO_POSIXAIO    = 1 << 3,
        FIO_SGIO        = 1 << 4,
+       FIO_SPLICEIO    = 1 << 5 | FIO_SYNCIO,
 };
 
 #define td_read(td)            ((td)->ddir == DDIR_READ)