[PATCH] Add bw/lat log as job options

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index e279574a387026ab07e5b975df2a51fe5d384d0e..4af6a74339468ea32000680abd16dc8c4bf54809 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -181,7 +181,6 @@ struct thread_data {
 
        unsigned char sequential;
        unsigned char odirect;
-       unsigned char create_file;
        unsigned char invalidate_cache;
        unsigned char create_serialize;
        unsigned char create_fsync;
@@ -193,6 +192,8 @@ struct thread_data {
        unsigned char do_disk_util;
        unsigned char override_sync;
        unsigned char rand_repeatable;
+       unsigned char write_lat_log;
+       unsigned char write_bw_log;
 
        unsigned int bs;
        unsigned int min_bs;
@@ -338,8 +339,6 @@ extern struct io_u *__get_io_u(struct thread_data *);
 extern void put_io_u(struct thread_data *, struct io_u *);
 
 extern int rate_quit;
-extern int write_lat_log;
-extern int write_bw_log;
 extern int exitall_on_terminate;
 extern int thread_number;
 extern int shm_id;
@@ -448,6 +447,7 @@ extern int init_random_state(struct thread_data *);
  */
 extern void close_files(struct thread_data *);
 extern int setup_files(struct thread_data *);
+extern int file_invalidate_cache(struct thread_data *, struct fio_file *);
 
 /*
  * ETA/status stuff
@@ -539,7 +539,9 @@ extern void close_ioengine(struct thread_data *);
  */
 #define fio_unused     __attribute((__unused__))
 
+#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)        \
-       for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f) = &(td)->files[(i)])
+       for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f)++)
 
 #endif