X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=2104e3a9325dd2456c2dfe91a6837c5c9d08a9c8;hp=f9f2a577836554c52ac7b9e816acea6aef1384b2;hb=5e62c22a669c7a8c03b7871852cf85ad6d355980;hpb=a9b7b3052b35c20e82b8fc909cd546a5fe1ff293

diff --git a/fio.h b/fio.h
index f9f2a577..2104e3a9 100644
--- a/fio.h
+++ b/fio.h
@@ -15,6 +15,7 @@
 
 #include "compiler/compiler.h"
 #include "list.h"
+#include "fifo.h"
 #include "rbtree.h"
 #include "md5.h"
 #include "crc32.h"
@@ -88,6 +89,7 @@ struct io_piece {
 	unsigned long long offset;
 	unsigned long len;
 	enum fio_ddir ddir;
+	unsigned long delay;
 };
 
 #ifdef FIO_HAVE_SYSLET
@@ -266,6 +268,7 @@ struct fio_file {
 	 */
 	char *file_name;
 	void *mmap;
+	unsigned int major, minor;
 
 	/*
 	 * size of the file, offset into file, and io size from that offset
@@ -391,7 +394,7 @@ struct thread_options {
 	unsigned int thinktime_blocks;
 	unsigned int fsync_blocks;
 	unsigned int start_delay;
-	unsigned long timeout;
+	unsigned long long timeout;
 	unsigned int overwrite;
 	unsigned int bw_avg_time;
 	unsigned int loops;
@@ -403,8 +406,8 @@ struct thread_options {
 	unsigned int new_group;
 	unsigned int numjobs;
 	os_cpu_mask_t cpumask;
+	unsigned int cpumask_set;
 	unsigned int iolog;
-	unsigned int read_iolog;
 	unsigned int rwmixcycle;
 	unsigned int rwmix[2];
 	unsigned int nice;
@@ -522,6 +525,7 @@ struct thread_data {
 	struct timeval start;	/* start of this loop */
 	struct timeval epoch;	/* time job was started */
 	struct timeval rw_end[2];
+	struct timeval last_issue;
 	unsigned int rw_end_set[2];
 
 	/*
@@ -664,13 +668,6 @@ struct disk_util {
 
 #define DISK_UTIL_MSEC	(250)
 
-#ifndef min
-#define min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#endif
-
 /*
  * Log exports
  */
@@ -826,6 +823,14 @@ extern int __must_check td_io_commit(struct thread_data *);
 extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
 extern void td_io_close_file(struct thread_data *, struct fio_file *);
 
+/*
+ * blktrace support
+ */
+#ifdef FIO_HAVE_BLKTRACE
+extern int is_blktrace(const char *);
+extern int load_blktrace(struct thread_data *, const char *);
+#endif
+
 /*
  * If logging output to a file, stderr should go to both stderr and f_err
  */