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

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 719b2f3b8342f03648ec1cbbabdfd1d57cb51462..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;
 
@@ -343,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)
@@ -368,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;