X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=2129882f5309ccdaea91fe737e8f01132ed2b3e1;hp=7cf5cab1eccc59b96d47f36e2e741dfdbe99f045;hb=9cedf16704b71cec33138bb4cf524d3fc9ad338a;hpb=b5af82930ccfd7dda6a1b11794efb452eb76d8dc

diff --git a/init.c b/init.c
index 7cf5cab1..2129882f 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,6 @@
 
 #define td_var_offset(var)	((size_t) &((struct thread_data *)0)->var)
 
-static int str_ioengine_cb(void *, const char *);
 static int str_mem_cb(void *, const char *);
 static int str_lockmem_cb(void *, unsigned long *);
 #ifdef FIO_HAVE_IOPRIO
@@ -80,8 +79,8 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "ioengine",
-		.type	= FIO_OPT_STR,
-		.cb	= str_ioengine_cb,
+		.type	= FIO_OPT_STR_STORE,
+		.off1	= td_var_offset(ioengine),
 		.help	= "IO engine to use",
 		.def	= "sync",
 		.posval	= {
@@ -103,6 +102,7 @@ static struct fio_option options[] = {
 #ifdef FIO_HAVE_SYSLET
 			  { .ival = "syslet-rw", },
 #endif
+			  { .ival = "cpuio", },
 			  { .ival = "external", },
 			  },
 	},
@@ -475,7 +475,8 @@ static struct fio_option options[] = {
 		.name	= "cpuchunks",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(cpucycle),
-		.help	= "Length of the CPU burn cycles",
+		.help	= "Length of the CPU burn cycles (usecs)",
+		.def	= "50000",
 	},
 #ifdef FIO_HAVE_CPU_AFFINITY
 	{
@@ -774,6 +775,20 @@ static char *to_kmg(unsigned int val)
 	return buf;
 }
 
+/* External engines are specified by "external:name.o") */
+static const char *get_engine_name(const char *str)
+{
+	char *p = strstr(str, ":");
+
+	if (!p)
+		return str;
+
+	p++;
+	strip_blank_front(&p);
+	strip_blank_end(p);
+	return p;
+}
+
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -786,6 +801,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	struct stat sb;
 	int numjobs, i;
 	struct fio_file *f;
+	const char *engine;
 
 	/*
 	 * the def_thread is just for options, it's not a real job
@@ -793,13 +809,26 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td == &def_thread)
 		return 0;
 
-	assert(td->io_ops);
+	engine = get_engine_name(td->ioengine);
+	td->io_ops = load_ioengine(td, engine);
+	if (!td->io_ops) {
+		log_err("fio: failed to load engine %s\n", engine);
+		return 1;
+	}
+
+	if (td->use_thread)
+		nr_thread++;
+	else
+		nr_process++;
 
 	if (td->odirect)
 		td->io_ops->flags |= FIO_RAWIO;
 
+	if (!td->filename)
+		td->filename = strdup(jobname);
+
 	td->filetype = FIO_TYPE_FILE;
-	if (td->filename && !lstat(td->filename, &sb)) {
+	if (!lstat(td->filename, &sb)) {
 		if (S_ISBLK(sb.st_mode))
 			td->filetype = FIO_TYPE_BD;
 		else if (S_ISCHR(sb.st_mode))
@@ -811,7 +840,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td->filename)
 		td->nr_uniq_files = 1;
 	else
-		td->nr_uniq_files = td->nr_files;
+		td->nr_uniq_files = td->open_files;
 
 	if (td->filetype == FIO_TYPE_FILE || td->filename) {
 		char tmp[PATH_MAX];
@@ -857,7 +886,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		f->file_offset = td->start_offset;
 	}
 		
-	fio_sem_init(&td->mutex, 0);
+	td->mutex = fio_sem_init(0);
 
 	td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
 	td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
@@ -883,7 +912,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 	if (!terse_output) {
 		if (!job_add_num) {
-			if (td->io_ops->flags & FIO_CPUIO)
+			if (!strcmp(td->io_ops->name, "cpuio"))
 				fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
 			else {
 				char *c1, *c2, *c3, *c4;
@@ -938,7 +967,7 @@ int init_random_state(struct thread_data *td)
 	int fd, num_maps, blocks, i;
 	struct fio_file *f;
 
-	if (td->io_ops->flags & FIO_CPUIO)
+	if (td->io_ops->flags & FIO_DISKLESSIO)
 		return 0;
 
 	fd = open("/dev/urandom", O_RDONLY);
@@ -973,6 +1002,10 @@ int init_random_state(struct thread_data *td)
 			blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
 			num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
 			f->file_map = malloc(num_maps * sizeof(long));
+			if (!f->file_map) {
+				log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+				return 1;
+			}
 			f->num_maps = num_maps;
 			memset(f->file_map, 0, num_maps * sizeof(long));
 		}
@@ -1043,32 +1076,6 @@ static int str_mem_cb(void *data, const char *mem)
 	return 0;
 }
 
-/* External engines are specified by "external:name.o") */
-static const char *get_engine_name(const char *str)
-{
-	char *p = strstr(str, ":");
-
-	if (!p)
-		return str;
-
-	p++;
-	strip_blank_front(&p);
-	strip_blank_end(p);
-	return p;
-}
-
-static int str_ioengine_cb(void *data, const char *str)
-{
-	struct thread_data *td = data;
-	const char *name = get_engine_name(str);
-
-	td->io_ops = load_ioengine(td, name);
-	if (td->io_ops)
-		return 0;
-
-	return 1;
-}
-
 static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
 {
 	mlock_size = *val;