X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=e314d6c0a74067904e8beacc3f832a48085e2772;hb=56f9498d8588d42df2a41a7eb7ebcffef013a339;hp=20dd625dfe3bb1a77b1209916f7b7dc754a19a37;hpb=b2a151925a91f38aeb298d693687a47269ad4e94;p=fio.git

diff --git a/init.c b/init.c
index 20dd625d..e314d6c0 100644
--- a/init.c
+++ b/init.c
@@ -28,7 +28,6 @@
 #define DEF_SEQUENTIAL		(1)
 #define DEF_RAND_REPEAT		(1)
 #define DEF_OVERWRITE		(1)
-#define DEF_CREATE		(1)
 #define DEF_INVALIDATE		(1)
 #define DEF_SYNCIO		(0)
 #define DEF_RANDSEED		(0xb1899bedUL)
@@ -47,6 +46,9 @@
 #define DEF_RWMIX_READ		(50)
 #define DEF_NICE		(0)
 #define DEF_NR_FILES		(1)
+#define DEF_UNLINK		(0)
+#define DEF_WRITE_BW_LOG	(0)
+#define DEF_WRITE_LAT_LOG	(0)
 
 static int def_timeout = DEF_TIMEOUT;
 
@@ -59,14 +61,15 @@ struct thread_data def_thread;
 struct thread_data *threads = NULL;
 
 int rate_quit = 0;
-int write_lat_log = 0;
-int write_bw_log = 0;
 int exitall_on_terminate = 0;
 int terse_output = 0;
 unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
 
+static int write_lat_log = DEF_WRITE_LAT_LOG;
+static int write_bw_log = DEF_WRITE_BW_LOG;
+
 /*
  * Return a free job structure.
  */
@@ -140,7 +143,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		td->iodepth = 1;
 	else {
 		if (!td->iodepth)
-			td->iodepth = 1;
+			td->iodepth = td->nr_files;
 	}
 
 	/*
@@ -166,7 +169,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td->odirect)
 		td->io_ops->flags |= FIO_RAWIO;
 
-	if (td->filetype == FIO_TYPE_FILE) {
+	if (td->filename)
+		td->nr_uniq_files = 1;
+	else
+		td->nr_uniq_files = td->nr_files;
+
+	if (td->filetype == FIO_TYPE_FILE || td->filename) {
 		char tmp[PATH_MAX];
 		int len = 0;
 		int i;
@@ -181,7 +189,10 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			f->fd = -1;
 			f->fileno = i;
 
-			sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
+			if (td->filename)
+				sprintf(tmp + len, "%s", td->filename);
+			else
+				sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
 			f->file_name = strdup(tmp);
 		}
 	} else {
@@ -220,11 +231,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (setup_rate(td))
 		goto err;
 
-	if (write_lat_log) {
+	if (td->write_lat_log) {
 		setup_log(&td->slat_log);
 		setup_log(&td->clat_log);
 	}
-	if (write_bw_log)
+	if (td->write_bw_log)
 		setup_log(&td->bw_log);
 
 	if (td->name[0] == '\0')
@@ -274,6 +285,7 @@ int init_random_state(struct thread_data *td)
 {
 	unsigned long seeds[4];
 	int fd, num_maps, blocks, i;
+	struct fio_file *f;
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
@@ -299,9 +311,7 @@ int init_random_state(struct thread_data *td)
 	if (td->rand_repeatable)
 		seeds[3] = DEF_RANDSEED;
 
-	for (i = 0; i < td->nr_files; i++) {
-		struct fio_file *f = &td->files[i];
-
+	for_each_file(td, f, i) {
 		blocks = (f->file_size + td->min_bs - 1) / td->min_bs;
 		num_maps = blocks / BLOCKS_PER_MAP;
 		f->file_map = malloc(num_maps * sizeof(long));
@@ -896,6 +906,11 @@ int parse_jobs_ini(char *file, int stonewall_flag)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_strstore(p, "filename", tmpbuf)) {
+				td->filename = strdup(tmpbuf);
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_strstore(p, "name", tmpbuf)) {
 				snprintf(td->name, sizeof(td->name)-1, "%s%d", tmpbuf, td->thread_number);
 				fgetpos(f, &off);
@@ -917,11 +932,6 @@ int parse_jobs_ini(char *file, int stonewall_flag)
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strset(p, "create")) {
-				td->create_file = 1;
-				fgetpos(f, &off);
-				continue;
-			}
 			if (!check_strset(p, "exitall")) {
 				exitall_on_terminate = 1;
 				fgetpos(f, &off);
@@ -937,6 +947,21 @@ int parse_jobs_ini(char *file, int stonewall_flag)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_strset(p, "unlink")) {
+				td->unlink = 1;
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_strset(p, "write_bw_log")) {
+				td->write_bw_log = 1;
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_strset(p, "write_lat_log")) {
+				td->write_lat_log = 1;
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_strstore(p, "iolog", tmpbuf)) {
 				if (td->write_iolog) {
 					log_err("fio: read iolog overrides given write_iolog\n");
@@ -1024,7 +1049,6 @@ static int fill_def_thread(void)
 	def_thread.ratecycle = DEF_RATE_CYCLE;
 	def_thread.sequential = DEF_SEQUENTIAL;
 	def_thread.timeout = def_timeout;
-	def_thread.create_file = DEF_CREATE;
 	def_thread.overwrite = DEF_OVERWRITE;
 	def_thread.invalidate_cache = DEF_INVALIDATE;
 	def_thread.sync_io = DEF_SYNCIO;
@@ -1042,6 +1066,9 @@ static int fill_def_thread(void)
 	def_thread.nice = DEF_NICE;
 	def_thread.rand_repeatable = DEF_RAND_REPEAT;
 	def_thread.nr_files = DEF_NR_FILES;
+	def_thread.unlink = DEF_UNLINK;
+	def_thread.write_bw_log = write_bw_log;
+	def_thread.write_lat_log = write_lat_log;
 #ifdef FIO_HAVE_DISK_UTIL
 	def_thread.do_disk_util = 1;
 #endif
@@ -1049,7 +1076,7 @@ static int fill_def_thread(void)
 	return 0;
 }
 
-static void usage(char *name)
+static void usage(void)
 {
 	printf("%s\n", fio_version_string);
 	printf("\t-o Write output to file\n");
@@ -1092,7 +1119,7 @@ static int parse_cmd_line(int argc, char *argv[])
 				idx = optind;
 				break;
 			case 'h':
-				usage(argv[0]);
+				usage();
 				exit(0);
 			case 'v':
 				printf("%s\n", fio_version_string);
@@ -1176,7 +1203,7 @@ int parse_options(int argc, char *argv[])
 	job_files = parse_cmd_line(argc, argv);
 	if (!job_files) {
 		log_err("Need job file(s)\n");
-		usage(argv[0]);
+		usage();
 		return 1;
 	}