X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=81674aa4b5f6425af0188b9542bdacb088bd442f;hp=de9cb4983a57d151ce444c03823b0beab7cfc6f3;hb=af959a78acda575cc7d3ffea0a8421e0574d0955;hpb=972cfd2546081c0397447ca9243ea419b1ff579a

diff --git a/init.c b/init.c
index de9cb498..81674aa4 100644
--- a/init.c
+++ b/init.c
@@ -1,3 +1,7 @@
+/*
+ * This file contains the ini and command liner parser. It will create
+ * and initialize the specified jobs.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -12,6 +16,9 @@
 
 #include "fio.h"
 
+/*
+ * The default options
+ */
 #define DEF_BS			(4096)
 #define DEF_TIMEOUT		(0)
 #define DEF_RATE_CYCLE		(1000)
@@ -40,13 +47,9 @@
 #define DEF_RWMIX_READ		(50)
 #define DEF_NICE		(0)
 
-static int def_sequential = DEF_SEQUENTIAL;
-static int def_bs = DEF_BS;
 static int def_timeout = DEF_TIMEOUT;
-static int def_repeatable = DEF_RAND_REPEAT;
-static int def_odirect = DEF_ODIRECT;
 
-static char fio_version_string[] = "fio 1.4";
+static char fio_version_string[] = "fio 1.5";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -58,10 +61,14 @@ 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;
 
+/*
+ * Return a free job structure.
+ */
 static struct thread_data *get_new_job(int global, struct thread_data *parent)
 {
 	struct thread_data *td;
@@ -86,6 +93,11 @@ static void put_job(struct thread_data *td)
 	thread_number--;
 }
 
+/*
+ * Adds a job to the list of things todo. Sanitizes the various options
+ * to make sure we don't have conflicts, and initializes various
+ * members of td.
+ */
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
 	char *ddir_str[] = { "read", "write", "randread", "randwrite",
@@ -125,6 +137,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td->zone_size && !td->sequential)
 		td->zone_size = 0;
 
+	/*
+	 * Reads can do overwrites, we always need to pre-create the file
+	 */
+	if (td_read(td) || td_rw(td))
+		td->overwrite = 1;
+
 	td->filetype = FIO_TYPE_FILE;
 	if (!stat(jobname, &sb)) {
 		if (S_ISBLK(sb.st_mode))
@@ -137,9 +155,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		char tmp[PATH_MAX];
 
 		if (td->directory && td->directory[0] != '\0')
-			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->jobnum);
+			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
 		else
-			sprintf(tmp, "%s.%d", jobname, td->jobnum);
+			sprintf(tmp, "%s.%d", jobname, td->thread_number);
 		td->file_name = strdup(tmp);
 	} else
 		td->file_name = strdup(jobname);
@@ -177,10 +195,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 
-	if (!job_add_num)
-		fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
-	else if (job_add_num == 1)
-		fprintf(f_out, "...\n");
+	if (!terse_output) {
+		if (!job_add_num)
+			fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+		else if (job_add_num == 1)
+			fprintf(f_out, "...\n");
+	}
 
 	/*
 	 * recurse add identical jobs, clear numjobs and stonewall options
@@ -195,7 +215,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 		td_new->numjobs = 1;
 		td_new->stonewall = 0;
-		td_new->jobnum = numjobs;
 		job_add_num = numjobs - 1;
 
 		if (add_job(td_new, jobname, job_add_num))
@@ -207,6 +226,10 @@ err:
 	return -1;
 }
 
+/*
+ * Initialize the various random states we need (random io, block size ranges,
+ * read/write mix, etc).
+ */
 int init_random_state(struct thread_data *td)
 {
 	unsigned long seeds[4];
@@ -233,7 +256,7 @@ int init_random_state(struct thread_data *td)
 	if (td->sequential)
 		return 0;
 
-	if (def_repeatable)
+	if (td->rand_repeatable)
 		seeds[3] = DEF_RANDSEED;
 
 	blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
@@ -260,7 +283,24 @@ static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
 #endif
 }
 
-static unsigned long get_mult(char c)
+static unsigned long get_mult_time(char c)
+{
+	switch (c) {
+		case 'm':
+		case 'M':
+			return 60;
+		case 'h':
+		case 'H':
+			return 60 * 60;
+		case 'd':
+		case 'D':
+			return 24 * 60 * 60;
+		default:
+			return 1;
+	}
+}
+
+static unsigned long get_mult_bytes(char c)
 {
 	switch (c) {
 		case 'k':
@@ -280,7 +320,7 @@ static unsigned long get_mult(char c)
 /*
  * convert string after '=' into decimal value, noting any size suffix
  */
-static int str_cnv(char *p, unsigned long long *val)
+static int str_to_decimal(char *p, unsigned long long *val, int kilo)
 {
 	char *str;
 	int len;
@@ -296,16 +336,27 @@ static int str_cnv(char *p, unsigned long long *val)
 	if (*val == ULONG_MAX && errno == ERANGE)
 		return 1;
 
-	*val *= get_mult(str[len - 1]);
+	if (kilo)
+		*val *= get_mult_bytes(str[len - 1]);
+	else
+		*val *= get_mult_time(str[len - 1]);
 	return 0;
 }
 
-static int check_strcnv(char *p, char *name, unsigned long long *val)
+static int check_str_bytes(char *p, char *name, unsigned long long *val)
 {
 	if (strncmp(p, name, strlen(name) - 1))
 		return 1;
 
-	return str_cnv(p, val);
+	return str_to_decimal(p, val, 1);
+}
+
+static int check_str_time(char *p, char *name, unsigned long long *val)
+{
+	if (strncmp(p, name, strlen(name) - 1))
+		return 1;
+
+	return str_to_decimal(p, val, 0);
 }
 
 static void strip_blank_front(char **p)
@@ -370,12 +421,12 @@ static int check_strstore(char *p, char *name, char *dest)
 	return 0;
 }
 
-static int __check_range(char *str, unsigned long *val)
+static int __check_range_bytes(char *str, unsigned long *val)
 {
 	char suffix;
 
 	if (sscanf(str, "%lu%c", val, &suffix) == 2) {
-		*val *= get_mult(suffix);
+		*val *= get_mult_bytes(suffix);
 		return 0;
 	}
 
@@ -385,7 +436,8 @@ static int __check_range(char *str, unsigned long *val)
 	return 1;
 }
 
-static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
+static int check_range_bytes(char *p, char *name, unsigned long *s,
+			     unsigned long *e)
 {
 	char option[128];
 	char *str, *p1, *p2;
@@ -421,7 +473,7 @@ static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
 	p2 = p + 1;
 	*p = '\0';
 
-	if (!__check_range(p1, s) && !__check_range(p2, e))
+	if (!__check_range_bytes(p1, s) && !__check_range_bytes(p2, e))
 		return 0;
 
 	return 1;
@@ -573,7 +625,7 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 /*
  * This is our [ini] type file parser.
  */
-int parse_jobs_ini(char *file)
+int parse_jobs_ini(char *file, int stonewall_flag)
 {
 	unsigned int prioclass, prio, cpu, global, il;
 	unsigned long long ull;
@@ -583,7 +635,7 @@ int parse_jobs_ini(char *file)
 	fpos_t off;
 	FILE *f;
 	char *p;
-	int ret = 0, stonewall = 1;
+	int ret = 0, stonewall;
 
 	f = fopen(file, "r");
 	if (!f) {
@@ -595,6 +647,7 @@ int parse_jobs_ini(char *file)
 	name = malloc(256);
 	tmpbuf = malloc(4096);
 
+	stonewall = stonewall_flag;
 	while ((p = fgets(string, 4096, f)) != NULL) {
 		if (ret)
 			break;
@@ -616,7 +669,7 @@ int parse_jobs_ini(char *file)
 		/*
 		 * Seperate multiple job files by a stonewall
 		 */
-		if (stonewall) {
+		if (!global && stonewall) {
 			td->stonewall = stonewall;
 			stonewall = 0;
 		}
@@ -656,6 +709,11 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_int(p, "rand_repeatable", &il)) {
+				td->rand_repeatable = il;
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_int(p, "rate", &td->rate)) {
 				fgetpos(f, &off);
 				continue;
@@ -691,7 +749,8 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_int(p, "timeout", &td->timeout)) {
+			if (!check_str_time(p, "timeout", &ull)) {
+				td->timeout = ull;
 				fgetpos(f, &off);
 				continue;
 			}
@@ -763,7 +822,7 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_range(p, "bsrange", &ul1, &ul2)) {
+			if (!check_range_bytes(p, "bsrange", &ul1, &ul2)) {
 				if (ul1 > ul2) {
 					td->max_bs = ul1;
 					td->min_bs = ul2;
@@ -774,28 +833,28 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strcnv(p, "bs", &ull)) {
+			if (!check_str_bytes(p, "bs", &ull)) {
 				td->bs = ull;
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strcnv(p, "size", &td->file_size)) {
+			if (!check_str_bytes(p, "size", &td->file_size)) {
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strcnv(p, "offset", &td->file_offset)) {
+			if (!check_str_bytes(p, "offset", &td->file_offset)) {
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strcnv(p, "zonesize", &td->zone_size)) {
+			if (!check_str_bytes(p, "zonesize", &td->zone_size)) {
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strcnv(p, "zoneskip", &td->zone_skip)) {
+			if (!check_str_bytes(p, "zoneskip", &td->zone_skip)) {
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strcnv(p, "lockmem", &mlock_size)) {
+			if (!check_str_bytes(p, "lockmem", &mlock_size)) {
 				fgetpos(f, &off);
 				continue;
 			}
@@ -925,14 +984,14 @@ static int fill_def_thread(void)
 	 */
 	def_thread.ddir = DDIR_READ;
 	def_thread.iomix = 0;
-	def_thread.bs = def_bs;
+	def_thread.bs = DEF_BS;
 	def_thread.min_bs = -1;
 	def_thread.max_bs = -1;
 	def_thread.io_engine = DEF_IO_ENGINE;
 	strcpy(def_thread.io_engine_name, DEF_IO_ENGINE_NAME);
-	def_thread.odirect = def_odirect;
+	def_thread.odirect = DEF_ODIRECT;
 	def_thread.ratecycle = DEF_RATE_CYCLE;
-	def_thread.sequential = def_sequential;
+	def_thread.sequential = DEF_SEQUENTIAL;
 	def_thread.timeout = def_timeout;
 	def_thread.create_file = DEF_CREATE;
 	def_thread.overwrite = DEF_OVERWRITE;
@@ -950,6 +1009,7 @@ static int fill_def_thread(void)
 	def_thread.rwmixcycle = DEF_RWMIX_CYCLE;
 	def_thread.rwmixread = DEF_RWMIX_READ;
 	def_thread.nice = DEF_NICE;
+	def_thread.rand_repeatable = DEF_RAND_REPEAT;
 #ifdef FIO_HAVE_DISK_UTIL
 	def_thread.do_disk_util = 1;
 #endif
@@ -960,13 +1020,11 @@ static int fill_def_thread(void)
 static void usage(char *name)
 {
 	printf("%s\n", fio_version_string);
-	printf("\t-s IO is sequential\n");
-	printf("\t-b Block size in KiB for each IO\n");
+	printf("\t-o Write output to file\n");
 	printf("\t-t Runtime in seconds\n");
-	printf("\t-R Exit all threads on failure to meet rate goal\n");
-	printf("\t-o Use O_DIRECT\n");
 	printf("\t-l Generate per-job latency logs\n");
 	printf("\t-w Generate per-job bandwidth logs\n");
+	printf("\t-m Minimal (terse) output\n");
 	printf("\t-f Job file (Required)\n");
 	printf("\t-v Print version info and exit\n");
 }
@@ -975,43 +1033,12 @@ static int parse_cmd_line(int argc, char *argv[])
 {
 	int c, idx = 1, ini_idx = 0;
 
-	while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwvhO:")) != EOF) {
+	while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) {
 		switch (c) {
-			case 's':
-				def_sequential = !!atoi(optarg);
-				idx++;
-				break;
-			case 'b':
-				def_bs = atoi(optarg);
-				def_bs <<= 10;
-				if (!def_bs) {
-					printf("bad block size\n");
-					def_bs = DEF_BS;
-				}
-				idx++;
-				break;
 			case 't':
 				def_timeout = atoi(optarg);
 				idx++;
 				break;
-			case 'r':
-				def_repeatable = !!atoi(optarg);
-				idx++;
-				break;
-			case 'R':
-				rate_quit = !!atoi(optarg);
-				idx++;
-				break;
-			case 'o':
-				def_odirect = !!atoi(optarg);
-				idx++;
-				break;
-			case 'f':
-				ini_idx++;
-				ini_file = realloc(ini_file, ini_idx * sizeof(char *));
-				ini_file[ini_idx - 1] = strdup(optarg);
-				idx++;
-				break;
 			case 'l':
 				write_lat_log = 1;
 				idx++;
@@ -1020,7 +1047,7 @@ static int parse_cmd_line(int argc, char *argv[])
 				write_bw_log = 1;
 				idx++;
 				break;
-			case 'O':
+			case 'o':
 				f_out = fopen(optarg, "w+");
 				if (!f_out) {
 					perror("fopen output");
@@ -1029,6 +1056,10 @@ static int parse_cmd_line(int argc, char *argv[])
 				f_err = f_out;
 				idx++;
 				break;
+			case 'm':
+				terse_output = 1;
+				idx++;
+				break;
 			case 'h':
 				usage(argv[0]);
 				exit(0);
@@ -1064,6 +1095,11 @@ static void free_shm(void)
 	}
 }
 
+/*
+ * The thread area is shared between the main process and the job
+ * threads/processes. So setup a shared memory segment that will hold
+ * all the job info.
+ */
 static int setup_thread_area(void)
 {
 	/*
@@ -1071,9 +1107,9 @@ static int setup_thread_area(void)
 	 * we get a failure that looks like too large a shm segment
 	 */
 	do {
-		int s = max_jobs * sizeof(struct thread_data);
+		size_t size = max_jobs * sizeof(struct thread_data);
 
-		shm_id = shmget(0, s, IPC_CREAT | 0600);
+		shm_id = shmget(0, size, IPC_CREAT | 0600);
 		if (shm_id != -1)
 			break;
 		if (errno != EINVAL) {
@@ -1116,9 +1152,11 @@ int parse_options(int argc, char *argv[])
 	for (i = 0; i < job_files; i++) {
 		if (fill_def_thread())
 			return 1;
-		if (parse_jobs_ini(ini_file[i]))
+		if (parse_jobs_ini(ini_file[i], i))
 			return 1;
+		free(ini_file[i]);
 	}
 
+	free(ini_file);
 	return 0;
 }