X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=8a6a433833582552983ffadf4b2d9e596aa514d5;hp=1119a9806346219958ca512573f9ac4f25ca08d0;hb=adf57099338307b3a4a129475a12aad31e35ade3;hpb=357f618e3905a33fcc47f1f72a4657c5fc68c7d7

diff --git a/options.c b/options.c
index 1119a980..8a6a4338 100644
--- a/options.c
+++ b/options.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <assert.h>
+#include <libgen.h>
 
 #include "fio.h"
 #include "parse.h"
@@ -66,7 +67,9 @@ static int str_bssplit_cb(void *data, const char *input)
 		 */
 		if (i == td->o.bssplit_nr) {
 			td->o.bssplit_nr <<= 1;
-			td->o.bssplit = realloc(td->o.bssplit, td->o.bssplit_nr * sizeof(struct bssplit));
+			td->o.bssplit = realloc(td->o.bssplit,
+						td->o.bssplit_nr
+						  * sizeof(struct bssplit));
 		}
 
 		perc_str = strstr(fname, "/");
@@ -267,6 +270,36 @@ static int str_fst_cb(void *data, const char *str)
 	return 0;
 }
 
+static int check_dir(struct thread_data *td, char *fname)
+{
+	char file[PATH_MAX], *dir;
+	struct stat sb;
+	int elen = 0;
+
+	if (td->o.directory) {
+		strcpy(file, td->o.directory);
+		elen = strlen(file);
+	}
+
+	sprintf(file + elen, "/%s", fname);
+	dir = dirname(file);
+
+	if (lstat(dir, &sb) < 0) {
+		int ret = errno;
+
+		log_err("fio: %s is not a directory\n", dir);
+		td_verror(td, ret, "lstat");
+		return 1;
+	}
+
+	if (!S_ISDIR(sb.st_mode)) {
+		log_err("fio: %s is not a directory\n", dir);
+		return 1;
+	}
+
+	return 0;
+}
+
 static int str_filename_cb(void *data, const char *input)
 {
 	struct thread_data *td = data;
@@ -283,6 +316,10 @@ static int str_filename_cb(void *data, const char *input)
 	while ((fname = strsep(&str, ":")) != NULL) {
 		if (!strlen(fname))
 			break;
+		if (check_dir(td, fname)) {
+			free(p);
+			return 1;
+		}
 		add_file(td, fname);
 		td->o.nr_files++;
 	}
@@ -297,8 +334,10 @@ static int str_directory_cb(void *data, const char fio_unused *str)
 	struct stat sb;
 
 	if (lstat(td->o.directory, &sb) < 0) {
+		int ret = errno;
+
 		log_err("fio: %s is not a directory\n", td->o.directory);
-		td_verror(td, errno, "lstat");
+		td_verror(td, ret, "lstat");
 		return 1;
 	}
 	if (!S_ISDIR(sb.st_mode)) {
@@ -351,6 +390,18 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
 	return 0;
 }
 
+static int str_lockfile_cb(void *data, const char *str)
+{
+	struct thread_data *td = data;
+	char *nr = get_opt_postfix(str);
+
+	td->o.lockfile_batch = 1;
+	if (nr)
+		td->o.lockfile_batch = atoi(nr);
+
+	return 0;
+}
+
 #define __stringify_1(x)	#x
 #define __stringify(x)		__stringify_1(x)
 
@@ -384,6 +435,30 @@ static struct fio_option options[] = {
 		.cb	= str_filename_cb,
 		.help	= "File(s) to use for the workload",
 	},
+	{
+		.name	= "lockfile",
+		.type	= FIO_OPT_STR,
+		.cb	= str_lockfile_cb,
+		.off1	= td_var_offset(file_lock_mode),
+		.help	= "Lock file when doing IO to it",
+		.parent	= "filename",
+		.def	= "none",
+		.posval = {
+			  { .ival = "none",
+			    .oval = FILE_LOCK_NONE,
+			    .help = "No file locking",
+			  },
+			  { .ival = "exclusive",
+			    .oval = FILE_LOCK_EXCLUSIVE,
+			    .help = "Exclusive file lock",
+			  },
+			  {
+			    .ival = "readwrite",
+			    .oval = FILE_LOCK_READWRITE,
+			    .help = "Read vs write lock",
+			  },
+		},
+	},
 	{
 		.name	= "opendir",
 		.type	= FIO_OPT_STR_STORE,
@@ -599,6 +674,14 @@ static struct fio_option options[] = {
 		.help	= "Accept potential duplicate random blocks",
 		.parent = "rw",
 	},
+	{
+		.name	= "softrandommap",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(softrandommap),
+		.help	= "Allow randommap to fail and continue witout",
+		.parent	= "norandommap",
+		.def	= "0",
+	},
 	{
 		.name	= "nrfiles",
 		.type	= FIO_OPT_INT,
@@ -816,7 +899,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_VAL_INT,
 		.help	= "Offset verify header location by N bytes",
 		.def	= "0",
-		.cb	= str_verify_offset_cb,	
+		.cb	= str_verify_offset_cb,
 		.parent	= "verify",
 	},
 	{
@@ -905,11 +988,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "rwmixcycle",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rwmixcycle),
-		.help	= "Cycle period for mixed read/write workloads (msec)",
-		.def	= "500",
-		.parent	= "rwmixread",
+		.type	= FIO_OPT_DEPRECATED,
 	},
 	{
 		.name	= "nice",
@@ -1014,7 +1093,8 @@ static struct fio_option options[] = {
 		.name	= "bwavgtime",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(bw_avg_time),
-		.help	= "Time window over which to calculate bandwidth (msec)",
+		.help	= "Time window over which to calculate bandwidth"
+			  " (msec)",
 		.def	= "500",
 	},
 	{