X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=95c282acaae8bff48b30eedbd9ef2ffde5427ead;hp=b192e587ac69807f6a829a5efa7fe28a22d95bd0;hb=refs%2Ftags%2Ffio-1.24;hpb=3b8b7135602a4d3a7132fee10da9c1203ab643ad

diff --git a/init.c b/init.c
index b192e587..95c282ac 100644
--- a/init.c
+++ b/init.c
@@ -19,7 +19,7 @@
 #include "smalloc.h"
 #include "filehash.h"
 
-static char fio_version_string[] = "fio 1.21";
+static char fio_version_string[] = "fio 1.24";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -27,7 +27,7 @@ static char **ini_file;
 static int max_jobs = MAX_JOBS;
 static int dump_cmdline;
 
-struct thread_data def_thread;
+static struct thread_data def_thread;
 struct thread_data *threads = NULL;
 
 int exitall_on_terminate = 0;
@@ -214,6 +214,23 @@ static int fixup_options(struct thread_data *td)
 {
 	struct thread_options *o = &td->o;
 
+#ifndef FIO_HAVE_PSHARED_MUTEX
+	if (!td->o.use_thread) {
+		log_info("fio: this platform does not support process shared"
+			 " mutexes, forcing use of threads. Use the 'thread'"
+			 " option to get rid of this warning.\n");
+		td->o.use_thread = 1;
+	}
+#endif
+
+#ifndef FIO_HAVE_CPU_AFFINITY
+	if (td->o.gtod_cpu) {
+		log_err("fio: platform must support CPU affinity for"
+			"gettimeofday() offloading\n");
+		return 1;
+	}
+#endif
+
 	if (read_only && td_write(td)) {
 		log_err("fio: job <%s> has write bit set, but fio is in"
 			" read-only mode\n", td->o.name);
@@ -637,6 +654,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
 	alloc_opts = 8;
 	opts = malloc(sizeof(char *) * alloc_opts);
+	num_opts = 0;
 
 	stonewall = stonewall_flag;
 	do {
@@ -751,6 +769,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
 	free(string);
 	free(name);
+	free(opts);
 	if (f != stdin)
 		fclose(f);
 	return ret;
@@ -876,7 +895,8 @@ struct debug_level debug_levels[] = {
 	{ .name = "parse",	.shift = FD_PARSE },
 	{ .name = "diskutil",	.shift = FD_DISKUTIL },
 	{ .name = "job",	.shift = FD_JOB },
-	{ },
+	{ .name = "mutex",	.shift = FD_MUTEX },
+	{ .name = NULL, },
 };
 
 static int set_debug(const char *string)
@@ -1102,5 +1122,11 @@ int parse_options(int argc, char *argv[])
 		return 1;
 	}
 
+	if (def_thread.o.gtod_offload) {
+		fio_gtod_init();
+		fio_gtod_offload = 1;
+		fio_gtod_cpu = def_thread.o.gtod_cpu;
+	}
+
 	return 0;
 }