X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=036e62afe115316fed70751d5f2e3374da84485c;hp=dab66d2b94766d7073fbe03ceab6ae1651b3879e;hb=e4928662a8a1674debae803d5ec4dcbdce7a3ddc;hpb=691c8fb014da9dd82e999a90b5511423f4eee188

diff --git a/fio.h b/fio.h
index dab66d2b..036e62af 100644
--- a/fio.h
+++ b/fio.h
@@ -446,6 +446,7 @@ struct thread_options {
 	unsigned int write_lat_log;
 	unsigned int write_bw_log;
 	unsigned int norandommap;
+	unsigned int softrandommap;
 	unsigned int bs_unaligned;
 	unsigned int fsync_on_close;
 
@@ -597,8 +598,7 @@ struct thread_data {
 	 * read/write mixed workload state
 	 */
 	os_random_state_t rwmix_state;
-	unsigned long long rwmix_bytes;
-	struct timeval rwmix_switch;
+	unsigned long rwmix_issues;
 	enum fio_ddir rwmix_ddir;
 	unsigned int ddir_nr;
 
@@ -683,6 +683,7 @@ extern unsigned long long mlock_size;
 extern unsigned long page_mask, page_size;
 extern int read_only;
 extern int eta_print;
+extern unsigned long done_secs;
 extern char *job_section;
 
 extern struct thread_data *threads;
@@ -691,6 +692,7 @@ extern struct thread_data *threads;
 #define td_write(td)		((td)->o.td_ddir & TD_DDIR_WRITE)
 #define td_rw(td)		(((td)->o.td_ddir & TD_DDIR_RW) == TD_DDIR_RW)
 #define td_random(td)		((td)->o.td_ddir & TD_DDIR_RAND)
+#define file_randommap(td, f)	(!(td)->o.norandommap && (f)->file_map)
 
 static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 {
@@ -755,6 +757,7 @@ enum file_log_act {
 	FIO_LOG_ADD_FILE,
 	FIO_LOG_OPEN_FILE,
 	FIO_LOG_CLOSE_FILE,
+	FIO_LOG_UNLINK_FILE,
 };
 
 extern int __must_check read_iolog_get(struct thread_data *, struct io_u *);