X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=3469584f3c9f51162f5a9c2fb755213af7bfb736;hb=fc4398fdf45b76c3aa11e14e78fc41a1fb42eb7e;hp=3f0dfc6e8d5a46fc8fccde64eaf456fc89beb958;hpb=5ec10eaad3b09875b91e19a20bbdfa06f2117562;p=fio.git

diff --git a/init.c b/init.c
index 3f0dfc6e..3469584f 100644
--- a/init.c
+++ b/init.c
@@ -19,7 +19,7 @@
 #include "smalloc.h"
 #include "filehash.h"
 
-static char fio_version_string[] = "fio 1.20-rc1";
+static char fio_version_string[] = "fio 1.20";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -47,6 +47,8 @@ static int write_lat_log;
 static int prev_group_jobs;
 
 unsigned long fio_debug = 0;
+unsigned int fio_debug_jobno = -1;
+unsigned int *fio_debug_jobp = NULL;
 
 /*
  * Command line options. These will contain the above, plus a few
@@ -118,6 +120,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
 		.has_arg	= required_argument,
 		.val		= 'x',
 	},
+	{
+		.name		= "alloc-size",
+		.has_arg	= required_argument,
+		.val		= 'a',
+	},
 	{
 		.name		= NULL,
 	},
@@ -309,6 +316,9 @@ static int fixup_options(struct thread_data *td)
 		log_info("fio: mixed read/write workload with verify. May not "
 		 "work as expected, unless you pre-populated the file\n");
 
+	if (td->o.verify != VERIFY_NONE)
+		td->o.refill_buffers = 1;
+
 	return 0;
 }
 
@@ -446,7 +456,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		td->io_ops->flags |= FIO_RAWIO;
 
 	file_alloced = 0;
-	if (!td->o.filename && !td->files_index) {
+	if (!td->o.filename && !td->files_index && !td->o.read_iolog_file) {
 		file_alloced = 1;
 
 		if (td->o.nr_files == 1 && exists_and_not_file(jobname))
@@ -752,8 +762,12 @@ static void free_shm(void)
 	struct shmid_ds sbuf;
 
 	if (threads) {
-		shmdt((void *) threads);
+		void *tp = threads;
+
 		threads = NULL;
+		file_hash_exit();
+		fio_debug_jobp = NULL;
+		shmdt(tp);
 		shmctl(shm_id, IPC_RMID, &sbuf);
 	}
 
@@ -778,6 +792,7 @@ static int setup_thread_area(void)
 		size_t size = max_jobs * sizeof(struct thread_data);
 
 		size += file_hash_size;
+		size += sizeof(unsigned int);
 
 		shm_id = shmget(0, size, IPC_CREAT | 0600);
 		if (shm_id != -1)
@@ -801,6 +816,8 @@ static int setup_thread_area(void)
 
 	memset(threads, 0, max_jobs * sizeof(struct thread_data));
 	hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+	fio_debug_jobp = (void *) hash + file_hash_size;
+	*fio_debug_jobp = -1;
 	file_hash_init(hash);
 	atexit(free_shm);
 	return 0;
@@ -826,6 +843,8 @@ static void usage(const char *name)
 	printf("\t--readonly\tTurn on safety read-only checks, preventing"
 		" writes\n");
 	printf("\t--section=name\tOnly run specified section in job file\n");
+	printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
+		" (def 1024)\n");
 }
 
 #ifdef FIO_INC_DEBUG
@@ -838,6 +857,8 @@ struct debug_level debug_levels[] = {
 	{ .name = "verify",	.shift = FD_VERIFY },
 	{ .name = "random",	.shift = FD_RANDOM },
 	{ .name = "parse",	.shift = FD_PARSE },
+	{ .name = "diskutil",	.shift = FD_DISKUTIL },
+	{ .name = "job",	.shift = FD_JOB },
 	{ },
 };
 
@@ -858,22 +879,38 @@ static int set_debug(const char *string)
 		}
 		log_info("all\n");
 		return 1;
-	} else if (!strcmp(string, "all")) {
-		fio_debug = ~0UL;
-		return 0;
 	}
 
 	while ((opt = strsep(&p, ",")) != NULL) {
 		int found = 0;
 
+		if (!strncmp(opt, "all", 3)) {
+			log_info("fio: set all debug options\n");
+			fio_debug = ~0UL;
+			continue;
+		}
+
 		for (i = 0; debug_levels[i].name; i++) {
 			dl = &debug_levels[i];
-			if (!strncmp(opt, dl->name, strlen(opt))) {
+			found = !strncmp(opt, dl->name, strlen(dl->name));
+			if (!found)
+				continue;
+
+			if (dl->shift == FD_JOB) {
+				opt = strchr(opt, ':');
+				if (!opt) {
+					log_err("fio: missing job number\n");
+					break;
+				}
+				opt++;
+				fio_debug_jobno = atoi(opt);
+				log_info("fio: set debug jobno %d\n",
+							fio_debug_jobno);
+			} else {
 				log_info("fio: set debug option %s\n", opt);
-				found = 1;
 				fio_debug |= (1UL << dl->shift);
-				break;
 			}
+			break;
 		}
 
 		if (!found)
@@ -896,6 +933,9 @@ static int parse_cmd_line(int argc, char *argv[])
 
 	while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
 		switch (c) {
+		case 'a':
+			smalloc_pool_size = atoi(optarg);
+			break;
 		case 't':
 			def_timeout = atoi(optarg);
 			break;