X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=86020d96ae17bc6e1271a2ab6225d4e4f9c007d1;hb=9b23c9fb768ef052c7fe7cd825a714976a089e08;hp=c86e4629afef3116dd32cabf123a6d4bf3e94837;hpb=bd6f78b2f0b6375383948f126368804612ec0035;p=fio.git

diff --git a/fio.h b/fio.h
index c86e4629..86020d96 100644
--- a/fio.h
+++ b/fio.h
@@ -263,6 +263,7 @@ enum fio_ioengine_flags {
 	FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
 	FIO_UNIDIR	= 1 << 5,	/* engine is uni-directional */
 	FIO_NOIO	= 1 << 6,	/* thread does only pseudo IO */
+	FIO_SIGQUIT	= 1 << 7,	/* needs SIGQUIT to exit */
 };
 
 enum fio_file_flags {
@@ -270,9 +271,8 @@ enum fio_file_flags {
 	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 */
+	FIO_FILE_DONE		= 1 << 4,	/* io completed to this file */
+	FIO_SIZE_KNOWN		= 1 << 5,	/* size has been set */
 };
 
 /*
@@ -667,6 +667,7 @@ extern unsigned long long mlock_size;
 extern unsigned long page_mask, page_size;
 extern int read_only;
 extern int eta_print;
+extern char *job_section;
 
 extern struct thread_data *threads;
 
@@ -681,7 +682,7 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 }
 
 #define BLOCKS_PER_MAP		(8 * sizeof(long))
-#define TO_MAP_BLOCK(td, f, b)	((b) - ((f)->file_offset / (unsigned long long) (td)->o.rw_min_bs))
+#define TO_MAP_BLOCK(td, f, b)	(b)
 #define RAND_MAP_IDX(td, f, b)	(TO_MAP_BLOCK(td, f, b) / BLOCKS_PER_MAP)
 #define RAND_MAP_BIT(td, f, b)	(TO_MAP_BLOCK(td, f, b) & (BLOCKS_PER_MAP - 1))
 
@@ -979,9 +980,11 @@ enum {
 	FD_MEM,
 	FD_BLKTRACE,
 	FD_VERIFY,
+	FD_RANDOM,
 	FD_DEBUG_MAX,
 };
 
+#ifdef FIO_INC_DEBUG
 struct debug_level {
 	const char *name;
 	unsigned long shift;
@@ -989,6 +992,7 @@ struct debug_level {
 extern struct debug_level debug_levels[];
 
 extern unsigned long fio_debug;
+
 #define dprint(type, str, args...)				\
 	do {							\
 		assert(type < FD_DEBUG_MAX);			\
@@ -1004,9 +1008,16 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p)
 
 	dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
 					io_u->offset, io_u->buflen, io_u->ddir);
-	if (f)
-		dprint(FD_IO, "/%s", f->file_name);
-	dprint(FD_IO, "\n");
+	if (fio_debug & (1 << FD_IO)) {
+		if (f)
+			log_info("/%s", f->file_name);
+
+		log_info("\n");
+	}
 }
+#else
+#define dprint(type, str, args...)
+#define dprint_io_u(io_u, p)
+#endif
 
 #endif