X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio-ini.c;h=23810bafd2423210f7bb3b015e31695090d5bba2;hb=c9fad893e8333682d6ab67a269b0dd74f303c5bc;hp=2941a670f6a78603774b77b26d8782bc6a7378b2;hpb=f5d3e5ec43653859e744225cc585757e77e4dbdc;p=fio.git

diff --git a/fio-ini.c b/fio-ini.c
index 2941a670..23810baf 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -12,30 +12,32 @@
 
 #include "fio.h"
 
-#define DEF_BS		(4096)
-#define DEF_TIMEOUT	(0)
-#define DEF_RATE_CYCLE	(1000)
-#define DEF_ODIRECT	(1)
-#define DEF_IO_ENGINE	(FIO_SYNCIO)
+#define DEF_BS			(4096)
+#define DEF_TIMEOUT		(0)
+#define DEF_RATE_CYCLE		(1000)
+#define DEF_ODIRECT		(1)
+#define DEF_IO_ENGINE		(FIO_SYNCIO)
 #define DEF_IO_ENGINE_NAME	"sync"
-#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)
-#define DEF_BWAVGTIME	(500)
-#define DEF_CREATE_SER	(1)
+#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)
+#define DEF_BWAVGTIME		(500)
+#define DEF_CREATE_SER		(1)
 #define DEF_CREATE_FSYNC	(1)
-#define DEF_LOOPS	(1)
-#define DEF_VERIFY	(0)
-#define DEF_STONEWALL	(0)
-#define DEF_NUMJOBS	(1)
-#define DEF_USE_THREAD	(0)
-#define DEF_FILE_SIZE	(1024 * 1024 * 1024UL)
+#define DEF_LOOPS		(1)
+#define DEF_VERIFY		(0)
+#define DEF_STONEWALL		(0)
+#define DEF_NUMJOBS		(1)
+#define DEF_USE_THREAD		(0)
+#define DEF_FILE_SIZE		(1024 * 1024 * 1024UL)
+#define DEF_ZONE_SIZE		(0)
+#define DEF_ZONE_SKIP		(0)
 
-static char fio_version_string[] = "fio 1.1";
+static char fio_version_string[] = "fio 1.3";
 
 static int repeatable = DEF_RAND_REPEAT;
 static char *ini_file;
@@ -79,11 +81,11 @@ static void setup_log(struct io_log **log)
 
 void finish_log(struct thread_data *td, struct io_log *log, const char *name)
 {
-	char file_name[128];
+	char file_name[256];
 	FILE *f;
 	unsigned int i;
 
-	sprintf(file_name, "client%d_%s.log", td->thread_number, name);
+	snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
 	f = fopen(file_name, "w");
 	if (!f) {
 		perror("fopen log");
@@ -130,6 +132,8 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 	td->invalidate_cache = parent->invalidate_cache;
 	td->file_size = parent->file_size;
 	td->file_offset = parent->file_offset;
+	td->zone_size = parent->zone_size;
+	td->zone_skip = parent->zone_skip;
 	td->rate = parent->rate;
 	td->ratemin = parent->ratemin;
 	td->ratecycle = parent->ratecycle;
@@ -160,7 +164,8 @@ static void put_job(struct thread_data *td)
 static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 		   int prio)
 {
-	char *ddir_str[] = { "read", "write", "randread", "randwrite" };
+	char *ddir_str[] = { "read", "write", "randread", "randwrite",
+			     "rw", NULL, "randrw" };
 	struct stat sb;
 	int numjobs, ddir;
 
@@ -193,17 +198,27 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 			td->iodepth = 1;
 	}
 
+	/*
+	 * only really works for sequential io for now
+	 */
+	if (td->zone_size && !td->sequential)
+		td->zone_size = 0;
+
 	td->filetype = FIO_TYPE_FILE;
-	if (!stat(jobname, &sb) && S_ISBLK(sb.st_mode))
-		td->filetype = FIO_TYPE_BD;
+	if (!stat(jobname, &sb)) {
+		if (S_ISBLK(sb.st_mode))
+			td->filetype = FIO_TYPE_BD;
+		else if (S_ISCHR(sb.st_mode))
+			td->filetype = FIO_TYPE_CHAR;
+	}
 
 	if (td->filetype == FIO_TYPE_FILE) {
 		if (td->directory[0] != '\0')
-			sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->thread_number);
+			sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
 		else
-			sprintf(td->file_name, "%s.%d", jobname, td->thread_number);
+			sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
 	} else
-		strcpy(td->file_name, jobname);
+		strncpy(td->file_name, jobname, sizeof(td->file_name) - 1);
 
 	sem_init(&td->mutex, 0, 0);
 
@@ -215,7 +230,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 		td->min_bs = td->bs;
 	if (td->max_bs == -1U)
 		td->max_bs = td->bs;
-	if (td_read(td))
+	if (td_read(td) && !td_rw(td))
 		td->verify = 0;
 
 	if (td->stonewall && td->thread_number > 1)
@@ -233,7 +248,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 	if (write_bw_log)
 		setup_log(&td->bw_log);
 
-	ddir = td->ddir + (!td->sequential << 1);
+	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 	printf("Client%d (g=%d): rw=%s, prio=%d/%d, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], prioclass, prio, td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
 
 	/*
@@ -249,6 +264,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 
 		td_new->numjobs = 1;
 		td_new->stonewall = 0;
+		td_new->jobnum = numjobs;
 
 		if (add_job(td_new, jobname, prioclass, prio))
 			goto err;
@@ -353,7 +369,7 @@ static int str_cnv(char *p, unsigned long long *val)
 
 static int check_strcnv(char *p, char *name, unsigned long long *val)
 {
-	if (!strstr(p, name))
+	if (strncmp(p, name, strlen(name) - 1))
 		return 1;
 
 	return str_cnv(p, val);
@@ -375,6 +391,14 @@ static void strip_blank_end(char *p)
 	}
 }
 
+static void terminate_line(char *p)
+{
+	while (*p != '\n' && *p != '\0')
+		p++;
+
+	*p = '\0';
+}
+
 typedef int (str_cb_fn)(struct thread_data *, char *);
 
 static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td)
@@ -525,6 +549,16 @@ static int str_rw_cb(struct thread_data *td, char *mem)
 		td->ddir = DDIR_WRITE;
 		td->sequential = 0;
 		return 0;
+	} else if (!strncmp(mem, "rw", 2)) {
+		td->ddir = 0;
+		td->iomix = 1;
+		td->sequential = 1;
+		return 0;
+	} else if (!strncmp(mem, "randrw", 6)) {
+		td->ddir = 0;
+		td->iomix = 1;
+		td->sequential = 0;
+		return 0;
 	}
 
 	fprintf(stderr, "bad data direction: %s\n", mem);
@@ -594,6 +628,13 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 	return 1;
 }
 
+static int str_iolog_cb(struct thread_data *td, char *file)
+{
+	terminate_line(file);
+	strncpy(td->iolog_file, file, sizeof(td->iolog_file) - 1);
+
+	return 0;
+}
 
 int parse_jobs_ini(char *file)
 {
@@ -608,7 +649,7 @@ int parse_jobs_ini(char *file)
 
 	f = fopen(file, "r");
 	if (!f) {
-		perror("fopen");
+		perror("fopen job file");
 		return 1;
 	}
 
@@ -638,6 +679,7 @@ int parse_jobs_ini(char *file)
 				continue;
 			if (strstr(p, "["))
 				break;
+
 			if (!check_int(p, "prio", &prio)) {
 #ifndef FIO_HAVE_IOPRIO
 				fprintf(stderr, "io priorities not available\n");
@@ -755,6 +797,14 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_strcnv(p, "zonesize", &td->zone_size)) {
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_strcnv(p, "zoneskip", &td->zone_skip)) {
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_strstore(p, "directory", td->directory)) {
 				fgetpos(f, &off);
 				continue;
@@ -795,8 +845,14 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_str(p, "iolog", str_iolog_cb, td)) {
+				td->iolog = 1;
+				fgetpos(f, &off);
+				continue;
+			}
 
 			printf("Client%d: bad option %s\n",td->thread_number,p);
+			return 1;
 		}
 		fsetpos(f, &off);
 
@@ -823,6 +879,7 @@ static int fill_def_thread(void)
 	 * fill globals
 	 */
 	def_thread.ddir = DDIR_READ;
+	def_thread.iomix = 0;
 	def_thread.bs = DEF_BS;
 	def_thread.min_bs = -1;
 	def_thread.max_bs = -1;
@@ -852,11 +909,25 @@ static int fill_def_thread(void)
 	return 0;
 }
 
+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-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-f Job file (Required)\n");
+	printf("\t-v Print version info and exit\n");
+}
+
 static void parse_cmd_line(int argc, char *argv[])
 {
 	int c;
 
-	while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwv")) != EOF) {
+	while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwvh")) != EOF) {
 		switch (c) {
 			case 's':
 				def_thread.sequential = !!atoi(optarg);
@@ -890,11 +961,17 @@ static void parse_cmd_line(int argc, char *argv[])
 			case 'w':
 				write_bw_log = 1;
 				break;
+			case 'h':
+				usage(argv[0]);
+				exit(0);
 			case 'v':
 				printf("%s\n", fio_version_string);
 				exit(0);
 		}
 	}
+
+	if (!ini_file && argc > 1 && argv[argc - 1][0] != '-')
+		ini_file = strdup(argv[argc - 1]);
 }
 
 static void free_shm(void)
@@ -952,11 +1029,14 @@ int parse_options(int argc, char *argv[])
 
 	if (!ini_file) {
 		printf("Need job file\n");
+		usage(argv[0]);
 		return 1;
 	}
 
-	if (parse_jobs_ini(ini_file))
+	if (parse_jobs_ini(ini_file)) {
+		usage(argv[0]);
 		return 1;
+	}
 
 	return 0;
 }