Add --output-format command line option

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 7443bc06bdd510f79a5b3a550ea41d6d0e953874..b2bbe93f5bf5b3c7f8d1463ecd00f08359034baf 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -108,12 +108,12 @@ struct thread_options {
        unsigned long long file_size_high;
        unsigned long long start_offset;
 
-       unsigned int bs[2];
-       unsigned int ba[2];
-       unsigned int min_bs[2];
-       unsigned int max_bs[2];
-       struct bssplit *bssplit[2];
-       unsigned int bssplit_nr[2];
+       unsigned int bs[DDIR_RWDIR_CNT];
+       unsigned int ba[DDIR_RWDIR_CNT];
+       unsigned int min_bs[DDIR_RWDIR_CNT];
+       unsigned int max_bs[DDIR_RWDIR_CNT];
+       struct bssplit *bssplit[DDIR_RWDIR_CNT];
+       unsigned int bssplit_nr[DDIR_RWDIR_CNT];
 
        unsigned int nr_files;
        unsigned int open_files;
@@ -125,6 +125,7 @@ struct thread_options {
        unsigned int create_serialize;
        unsigned int create_fsync;
        unsigned int create_on_open;
+       unsigned int create_only;
        unsigned int end_fsync;
        unsigned int pre_read;
        unsigned int sync_io;
@@ -195,6 +196,7 @@ struct thread_options {
        unsigned int refill_buffers;
        unsigned int scramble_buffers;
        unsigned int compress_percentage;
+       unsigned int compress_chunk;
        unsigned int time_based;
        unsigned int disable_lat;
        unsigned int disable_clat;
@@ -226,11 +228,11 @@ struct thread_options {
        char *exec_prerun;
        char *exec_postrun;
 
-       unsigned int rate[2];
-       unsigned int ratemin[2];
+       unsigned int rate[DDIR_RWDIR_CNT];
+       unsigned int ratemin[DDIR_RWDIR_CNT];
        unsigned int ratecycle;
-       unsigned int rate_iops[2];
-       unsigned int rate_iops_min[2];
+       unsigned int rate_iops[DDIR_RWDIR_CNT];
+       unsigned int rate_iops_min[DDIR_RWDIR_CNT];
 
        char *ioscheduler;
 
@@ -265,6 +267,8 @@ struct thread_options {
        int flow_watermark;
        unsigned int flow_sleep;
 
+       unsigned long long offset_increment;
+
        unsigned int sync_file_range;
 };
 
@@ -286,10 +290,10 @@ struct thread_data {
        struct io_log *bw_log;
        struct io_log *iops_log;
 
-       uint64_t stat_io_bytes[2];
+       uint64_t stat_io_bytes[DDIR_RWDIR_CNT];
        struct timeval bw_sample_time;
 
-       uint64_t stat_io_blocks[2];
+       uint64_t stat_io_blocks[DDIR_RWDIR_CNT];
        struct timeval iops_sample_time;
 
        struct rusage ru_start;
@@ -307,6 +311,7 @@ struct thread_data {
                struct frand_state __next_file_state;
        };
        int error;
+       int sig;
        int done;
        pid_t pid;
        char *orig_buffer;
@@ -390,21 +395,21 @@ struct thread_data {
        /*
         * Rate state
         */
-       unsigned long long rate_bps[2];
-       long rate_pending_usleep[2];
-       unsigned long rate_bytes[2];
-       unsigned long rate_blocks[2];
-       struct timeval lastrate[2];
+       unsigned long long rate_bps[DDIR_RWDIR_CNT];
+       long rate_pending_usleep[DDIR_RWDIR_CNT];
+       unsigned long rate_bytes[DDIR_RWDIR_CNT];
+       unsigned long rate_blocks[DDIR_RWDIR_CNT];
+       struct timeval lastrate[DDIR_RWDIR_CNT];
 
        unsigned long long total_io_size;
        unsigned long long fill_device_size;
 
-       unsigned long io_issues[2];
-       unsigned long long io_blocks[2];
-       unsigned long long this_io_blocks[2];
-       unsigned long long io_bytes[2];
+       unsigned long io_issues[DDIR_RWDIR_CNT];
+       unsigned long long io_blocks[DDIR_RWDIR_CNT];
+       unsigned long long this_io_blocks[DDIR_RWDIR_CNT];
+       unsigned long long io_bytes[DDIR_RWDIR_CNT];
        unsigned long long io_skip_bytes;
-       unsigned long long this_io_bytes[2];
+       unsigned long long this_io_bytes[DDIR_RWDIR_CNT];
        unsigned long long zone_bytes;
        struct fio_mutex *mutex;
 
@@ -521,10 +526,10 @@ extern unsigned int thread_number;
 extern unsigned int nr_process, nr_thread;
 extern int shm_id;
 extern int groupid;
-extern int terse_output;
+extern int output_format;
 extern int temp_stall_ts;
 extern unsigned long long mlock_size;
-extern unsigned long page_mask, page_size;
+extern uintptr_t page_mask, page_size;
 extern int read_only;
 extern int eta_print;
 extern unsigned long done_secs;
@@ -716,10 +721,12 @@ static inline int should_check_rate(struct thread_data *td,
 {
        int ret = 0;
 
-       if (bytes_done[0])
-               ret |= __should_check_rate(td, 0);
-       if (bytes_done[1])
-               ret |= __should_check_rate(td, 1);
+       if (bytes_done[DDIR_READ])
+               ret |= __should_check_rate(td, DDIR_READ);
+       if (bytes_done[DDIR_WRITE])
+               ret |= __should_check_rate(td, DDIR_WRITE);
+       if (bytes_done[DDIR_TRIM])
+               ret |= __should_check_rate(td, DDIR_TRIM);
 
        return ret;
 }
@@ -754,4 +761,10 @@ static inline void td_io_u_free_notify(struct thread_data *td)
 extern const char *fio_get_arch_string(int);
 extern const char *fio_get_os_string(int);
 
+enum {
+       FIO_OUTPUT_TERSE        = 0,
+       FIO_OUTPUT_JSON,
+       FIO_OUTPUT_NORMAL,
+};
+
 #endif