parse: dump option type when using --debug=parse

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index a44f1aae47212b9e4065255a68c34dee25480f29..334f2036ac0b64646c6d30fdcc3085f0ce6099dd 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -88,6 +88,7 @@ enum {
        __TD_F_REGROW_LOGS,
        __TD_F_MMAP_KEEP,
        __TD_F_DIRS_CREATED,
+       __TD_F_CHECK_RATE,
        __TD_F_LAST,            /* not a real bit, keep last */
 };
 
@@ -108,6 +109,7 @@ enum {
        TD_F_REGROW_LOGS        = 1U << __TD_F_REGROW_LOGS,
        TD_F_MMAP_KEEP          = 1U << __TD_F_MMAP_KEEP,
        TD_F_DIRS_CREATED       = 1U << __TD_F_DIRS_CREATED,
+       TD_F_CHECK_RATE         = 1U << __TD_F_CHECK_RATE,
 };
 
 enum {
@@ -206,7 +208,6 @@ struct thread_data {
        unsigned int files_index;
        unsigned int nr_open_files;
        unsigned int nr_done_files;
-       unsigned int nr_normal_files;
        union {
                unsigned int next_file;
                struct frand_state next_file_state;
@@ -504,6 +505,7 @@ extern uintptr_t page_mask, page_size;
 extern int read_only;
 extern int eta_print;
 extern int eta_new_line;
+extern unsigned int eta_interval_msec;
 extern unsigned long done_secs;
 extern int fio_gtod_offload;
 extern int fio_gtod_cpu;
@@ -524,6 +526,8 @@ extern char *aux_path;
 
 extern struct thread_data *threads;
 
+extern bool eta_time_within_slack(unsigned int time);
+
 static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u)
 {
        assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
@@ -610,8 +614,8 @@ enum {
        TD_NR,
 };
 
-#define TD_ENG_FLAG_SHIFT      16
-#define TD_ENG_FLAG_MASK       ((1U << 16) - 1)
+#define TD_ENG_FLAG_SHIFT      17
+#define TD_ENG_FLAG_MASK       ((1U << 17) - 1)
 
 static inline void td_set_ioengine_flags(struct thread_data *td)
 {
@@ -700,8 +704,7 @@ static inline bool fio_fill_issue_time(struct thread_data *td)
        return false;
 }
 
-static inline bool __should_check_rate(struct thread_data *td,
-                                      enum fio_ddir ddir)
+static inline bool option_check_rate(struct thread_data *td, enum fio_ddir ddir)
 {
        struct thread_options *o = &td->o;
 
@@ -715,13 +718,19 @@ static inline bool __should_check_rate(struct thread_data *td,
        return false;
 }
 
+static inline bool __should_check_rate(struct thread_data *td,
+                                      enum fio_ddir ddir)
+{
+       return (td->flags & TD_F_CHECK_RATE) != 0;
+}
+
 static inline bool should_check_rate(struct thread_data *td)
 {
-       if (td->bytes_done[DDIR_READ] && __should_check_rate(td, DDIR_READ))
+       if (__should_check_rate(td, DDIR_READ) && td->bytes_done[DDIR_READ])
                return true;
-       if (td->bytes_done[DDIR_WRITE] && __should_check_rate(td, DDIR_WRITE))
+       if (__should_check_rate(td, DDIR_WRITE) && td->bytes_done[DDIR_WRITE])
                return true;
-       if (td->bytes_done[DDIR_TRIM] && __should_check_rate(td, DDIR_TRIM))
+       if (__should_check_rate(td, DDIR_TRIM) && td->bytes_done[DDIR_TRIM])
                return true;
 
        return false;
@@ -791,11 +800,6 @@ static inline void td_flags_set(struct thread_data *td, unsigned int *flags,
 extern const char *fio_get_arch_string(int);
 extern const char *fio_get_os_string(int);
 
-#ifdef FIO_INTERNAL
-#define ARRAY_SIZE(x)    (sizeof((x)) / (sizeof((x)[0])))
-#define FIELD_SIZE(s, f) (sizeof(((typeof(s))0)->f))
-#endif
-
 enum {
        __FIO_OUTPUT_TERSE      = 0,
        __FIO_OUTPUT_JSON       = 1,