fio: allow to combine terse output with any selected output type

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 0d7fbeb9b734980e4883d5feff3dde2a6e5ba9e0..d1180cd4809bb090e5a96e4266be0da5933c80e5 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -85,6 +85,7 @@ enum {
        FIO_RAND_SEQ_RAND_READ_OFF,
        FIO_RAND_SEQ_RAND_WRITE_OFF,
        FIO_RAND_SEQ_RAND_TRIM_OFF,
+       FIO_RAND_START_DELAY,
        FIO_RAND_NR_OFFS,
 };
 
@@ -164,6 +165,10 @@ struct thread_data {
                os_random_state_t trim_state;
                struct frand_state __trim_state;
        };
+       union {
+               os_random_state_t delay_state;
+               struct frand_state __delay_state;
+       };
 
        struct frand_state buf_state;
 
@@ -248,6 +253,16 @@ struct thread_data {
        unsigned int tv_cache_mask;
        unsigned int ramp_time_over;
 
+       /*
+        * Time since last latency_window was started
+        */
+       struct timeval latency_ts;
+       unsigned int latency_qd;
+       unsigned int latency_qd_high;
+       unsigned int latency_qd_low;
+       unsigned int latency_failed;
+       uint64_t latency_ios;
+
        /*
         * read/write mixed workload state
         */
@@ -333,10 +348,10 @@ enum {
 
 #define __td_verror(td, err, msg, func)                                        \
        do {                                                            \
-               int e = (err);                                          \
+               int ____e = (err);                                              \
                if ((td)->error)                                        \
                        break;                                          \
-               (td)->error = e;                                        \
+               (td)->error = ____e;                                    \
                if (!(td)->first_error)                                 \
                        snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));           \
        } while (0)
@@ -358,6 +373,7 @@ extern unsigned int stat_number;
 extern int shm_id;
 extern int groupid;
 extern int output_format;
+extern int append_terse_output;
 extern int temp_stall_ts;
 extern uintptr_t page_mask, page_size;
 extern int read_only;
@@ -406,7 +422,7 @@ extern int parse_cmd_line(int, char **, int);
 extern int fio_backend(void);
 extern void reset_fio_state(void);
 extern void clear_io_state(struct thread_data *);
-extern int fio_options_parse(struct thread_data *, char **, int);
+extern int fio_options_parse(struct thread_data *, char **, int, int);
 extern void fio_keywords_init(void);
 extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
 extern int fio_cmd_ioengine_option_parse(struct thread_data *, const char *, char *);
@@ -479,10 +495,16 @@ extern void reset_all_stats(struct thread_data *);
  * blktrace support
  */
 #ifdef FIO_HAVE_BLKTRACE
-extern int is_blktrace(const char *);
-extern int load_blktrace(struct thread_data *, const char *);
+extern int is_blktrace(const char *, int *);
+extern int load_blktrace(struct thread_data *, const char *, int);
 #endif
 
+/*
+ * Latency target helpers
+ */
+extern void lat_target_check(struct thread_data *);
+extern void lat_target_init(struct thread_data *);
+
 #define for_each_td(td, i)     \
        for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)        \