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

diff --git a/fio.h b/fio.h
index bcd188b3..d84eecfa 100644
--- a/fio.h
+++ b/fio.h
@@ -268,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
@@ -294,7 +295,8 @@ struct fio_file {
  * How many depth levels to log
  */
 #define FIO_IO_U_MAP_NR	8
-#define FIO_IO_U_LAT_NR 12
+#define FIO_IO_U_LAT_U_NR 10
+#define FIO_IO_U_LAT_M_NR 12
 
 struct thread_stat {
 	char *name;
@@ -332,7 +334,8 @@ struct thread_stat {
 	 * IO depth and latency stats
 	 */
 	unsigned int io_u_map[FIO_IO_U_MAP_NR];
-	unsigned int io_u_lat[FIO_IO_U_LAT_NR];
+	unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR];
+	unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR];
 	unsigned long total_io_u[2];
 	unsigned long short_io_u[2];
 
@@ -393,7 +396,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;
@@ -405,6 +408,7 @@ struct thread_options {
 	unsigned int new_group;
 	unsigned int numjobs;
 	os_cpu_mask_t cpumask;
+	unsigned int cpumask_set;
 	unsigned int iolog;
 	unsigned int rwmixcycle;
 	unsigned int rwmix[2];
@@ -824,8 +828,10 @@ 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