X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=e314d6c0a74067904e8beacc3f832a48085e2772;hb=13f8e2d2e3e5ec7d8c18b70fb2a2e2a026190020;hp=58aca3c2c81ba162809d7af4dc91008799359093;hpb=df64119de537aba99c85d1dc80190b354589f8b9;p=fio.git

diff --git a/init.c b/init.c
index 58aca3c2..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)
@@ -46,6 +45,10 @@
 #define DEF_RWMIX_CYCLE		(500)
 #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;
 
@@ -58,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.
  */
@@ -82,7 +86,6 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 	*td = *parent;
 	td->name[0] = '\0';
 
-	td->fd = -1;
 	td->thread_number = thread_number;
 	return td;
 }
@@ -103,7 +106,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	char *ddir_str[] = { "read", "write", "randread", "randwrite",
 			     "rw", NULL, "randrw" };
 	struct stat sb;
-	int numjobs, ddir;
+	int numjobs, ddir, i;
+	struct fio_file *f;
 
 #ifndef FIO_HAVE_LIBAIO
 	if (td->io_engine == FIO_LIBAIO) {
@@ -139,13 +143,13 @@ 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;
 	}
 
 	/*
-	 * only really works for sequential io for now
+	 * only really works for sequential io for now, and with 1 file
 	 */
-	if (td->zone_size && !td->sequential)
+	if (td->zone_size && !td->sequential && td->nr_files == 1)
 		td->zone_size = 0;
 
 	/*
@@ -162,17 +166,50 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			td->filetype = FIO_TYPE_CHAR;
 	}
 
-	if (td->filetype == FIO_TYPE_FILE) {
+	if (td->odirect)
+		td->io_ops->flags |= FIO_RAWIO;
+
+	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;
 
 		if (td->directory && td->directory[0] != '\0')
-			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
-		else
-			sprintf(tmp, "%s.%d", jobname, td->thread_number);
-		td->file_name = strdup(tmp);
-	} else
-		td->file_name = strdup(jobname);
+			sprintf(tmp, "%s/", td->directory);
 
+		td->files = malloc(sizeof(struct fio_file) * td->nr_files);
+
+		for_each_file(td, f, i) {
+			memset(f, 0, sizeof(*f));
+			f->fd = -1;
+			f->fileno = 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 {
+		td->nr_files = 1;
+		td->files = malloc(sizeof(struct fio_file));
+		f = &td->files[0];
+
+		memset(f, 0, sizeof(*f));
+		f->fd = -1;
+		f->file_name = strdup(jobname);
+	}
+
+	for_each_file(td, f, i) {
+		f->file_size = td->total_file_size / td->nr_files;
+		f->file_offset = td->start_offset;
+	}
+		
 	fio_sem_init(&td->mutex, 0);
 
 	td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
@@ -194,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')
@@ -247,7 +284,8 @@ err:
 int init_random_state(struct thread_data *td)
 {
 	unsigned long seeds[4];
-	int fd, num_maps, blocks;
+	int fd, num_maps, blocks, i;
+	struct fio_file *f;
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
@@ -273,11 +311,13 @@ int init_random_state(struct thread_data *td)
 	if (td->rand_repeatable)
 		seeds[3] = DEF_RANDSEED;
 
-	blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
-	num_maps = blocks / BLOCKS_PER_MAP;
-	td->file_map = malloc(num_maps * sizeof(long));
-	td->num_maps = num_maps;
-	memset(td->file_map, 0, num_maps * sizeof(long));
+	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));
+		f->num_maps = num_maps;
+		memset(f->file_map, 0, num_maps * sizeof(long));
+	}
 
 	os_random_seed(seeds[3], &td->random_state);
 	return 0;
@@ -821,6 +861,10 @@ int parse_jobs_ini(char *file, int stonewall_flag)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_int(p, "nrfiles", &td->nr_files)) {
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_range_bytes(p, "bsrange", &ul1, &ul2)) {
 				if (ul1 > ul2) {
 					td->max_bs = ul1;
@@ -837,11 +881,11 @@ int parse_jobs_ini(char *file, int stonewall_flag)
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_str_bytes(p, "size", &td->file_size)) {
+			if (!check_str_bytes(p, "size", &td->total_file_size)) {
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_str_bytes(p, "offset", &td->file_offset)) {
+			if (!check_str_bytes(p, "offset", &td->start_offset)) {
 				fgetpos(f, &off);
 				continue;
 			}
@@ -862,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);
@@ -883,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);
@@ -903,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");
@@ -990,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;
@@ -1007,6 +1065,10 @@ static int fill_def_thread(void)
 	def_thread.rwmixread = DEF_RWMIX_READ;
 	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
@@ -1014,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");
@@ -1057,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);
@@ -1141,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;
 	}