X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=bcd188b37808b8bc2f9e76c32d99a0a733803ce0;hp=92264d998752900730db96bb870af2b591b4afe3;hb=e28875637094451a3c5ec4071f964c1a02dd8f5b;hpb=cf4464ca60ce75ac241c621bc70a2500beeb782f

diff --git a/fio.h b/fio.h
index 92264d99..bcd188b3 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
@@ -238,13 +240,12 @@ enum fio_ioengine_flags {
 
 enum fio_file_flags {
 	FIO_FILE_OPEN		= 1 << 0,	/* file is open */
-	FIO_FILE_UNLINK		= 1 << 1,	/* unlink on close */
-	FIO_FILE_CLOSING	= 1 << 2,	/* file being closed */
-	FIO_FILE_EXISTS		= 1 << 3,	/* file there */
-	FIO_FILE_EXTEND		= 1 << 4,	/* needs extend */
-	FIO_FILE_NOSORT		= 1 << 5,	/* don't sort verify blocks */
-	FIO_FILE_DONE		= 1 << 6,	/* io completed to this file */
-	FIO_SIZE_KNOWN		= 1 << 7,	/* size has been set */
+	FIO_FILE_CLOSING	= 1 << 1,	/* file being closed */
+	FIO_FILE_EXISTS		= 1 << 2,	/* file there */
+	FIO_FILE_EXTEND		= 1 << 3,	/* needs extend */
+	FIO_FILE_NOSORT		= 1 << 4,	/* don't sort verify blocks */
+	FIO_FILE_DONE		= 1 << 5,	/* io completed to this file */
+	FIO_SIZE_KNOWN		= 1 << 6,	/* size has been set */
 };
 
 /*
@@ -405,7 +406,6 @@ struct thread_options {
 	unsigned int numjobs;
 	os_cpu_mask_t cpumask;
 	unsigned int iolog;
-	unsigned int read_iolog;
 	unsigned int rwmixcycle;
 	unsigned int rwmix[2];
 	unsigned int nice;
@@ -523,6 +523,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];
 
 	/*
@@ -665,13 +666,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
  */
@@ -827,6 +821,12 @@ 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
+ */
+extern int is_blktrace(const char *);
+extern int load_blktrace(struct thread_data *, const char *);
+
 /*
  * If logging output to a file, stderr should go to both stderr and f_err
  */