X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=66b7afe4a88a890092214231975bdd03b81b4332;hp=dcad1b392828f7ab1be5065011b641ea226b18f9;hb=b271fe62101e84cd6ca2a78c92299beba251db24;hpb=ee56ad500f6692381e131cc37299d23fa910a24a

diff --git a/init.c b/init.c
index dcad1b39..66b7afe4 100644
--- a/init.c
+++ b/init.c
@@ -213,13 +213,6 @@ static int fixup_options(struct thread_data *td)
 		o->write_iolog_file = NULL;
 	}
 
-	if (td->io_ops->flags & FIO_SYNCIO)
-		o->iodepth = 1;
-	else {
-		if (!o->iodepth)
-			o->iodepth = o->open_files;
-	}
-
 	/*
 	 * only really works for sequential io for now, and with 1 file
 	 */
@@ -779,16 +772,14 @@ static void usage(const char *name)
 	printf("\t          \tMay be \"always\", \"never\" or \"auto\"\n");
 }
 
-struct debug_level {
-	const char *name;
-	unsigned long mask;
-};
-
+#ifdef FIO_INC_DEBUG
 struct debug_level debug_levels[] = {
-	{ .name = "process", .mask = FD_PROCESS, },
-	{ .name = "file", .mask = FD_PROCESS, },
-	{ .name = "io", .mask = FD_IO, },
-	{ .name = "mem", .mask = FD_MEM, },
+	{ .name = "process",	.shift = FD_PROCESS, },
+	{ .name = "file",	.shift = FD_FILE, },
+	{ .name = "io",		.shift = FD_IO, },
+	{ .name = "mem",	.shift = FD_MEM, },
+	{ .name = "blktrace",	.shift = FD_BLKTRACE },
+	{ .name = "verify",	.shift = FD_VERIFY },
 	{ },
 };
 
@@ -807,7 +798,10 @@ static void set_debug(const char *string)
 			dl = &debug_levels[i];
 			log_info("%s,", dl->name);
 		}
-		log_info("\n");
+		log_info("all\n");
+		return;
+	} else if (!strcmp(string, "all")) {
+		fio_debug = ~0UL;
 		return;
 	}
 
@@ -819,7 +813,7 @@ static void set_debug(const char *string)
 			if (!strncmp(opt, dl->name, strlen(opt))) {
 				log_info("fio: set debug option %s\n", opt);
 				found = 1;
-				fio_debug |= dl->mask;
+				fio_debug |= (1UL << dl->shift);
 				break;
 			}
 		}
@@ -828,6 +822,12 @@ static void set_debug(const char *string)
 			log_err("fio: debug mask %s not found\n", opt);
 	}
 }
+#else
+static void set_debug(const char *string)
+{
+	log_err("fio: debug tracing not included in build\n");
+}
+#endif
 
 static int parse_cmd_line(int argc, char *argv[])
 {
@@ -933,7 +933,6 @@ static int parse_cmd_line(int argc, char *argv[])
 	return ini_idx;
 }
 
-
 int parse_options(int argc, char *argv[])
 {
 	int job_files, i;