[PATCH] Random map fix

[fio.git] / init.c

diff --git a/init.c b/init.c
index 611aa9c06bafeca927fbbb0db4bb3aeebe430208..4fe1dce8b9b8a306ff30e8afcdf9f88a6ec06474 100644 (file)
--- a/init.c
+++ b/init.c
@@ -41,6 +41,12 @@ static int str_cpumask_cb(void *, unsigned int *);
  * Map of job/command line options
  */
 static struct fio_option options[] = {
+       {
+               .name   = "description",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(description),
+               .help   = "Text job description",
+       },
        {
                .name   = "name",
                .type   = FIO_OPT_STR_STORE,
@@ -75,7 +81,7 @@ static struct fio_option options[] = {
                .help   = "IO engine to use",
                .def    = "sync",
                .posval = { "sync", "libaio", "posixaio", "mmap", "splice",
-                               "sg", "null", },
+                               "sg", "null", "net", },
        },
        {
                .name   = "iodepth",
@@ -417,7 +423,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(unlink),
                .help   = "Unlink created files after job has completed",
-               .def    = "1",
+               .def    = "0",
        },
        {
                .name   = "exitall",
@@ -532,7 +538,7 @@ FILE *f_out = NULL;
 FILE *f_err = NULL;
 
 static int write_lat_log = 0;
-static int write_bw_log = 0;
+int write_bw_log = 0;
 
 /*
  * Return a free job structure.
@@ -558,6 +564,9 @@ static void put_job(struct thread_data *td)
        if (td == &def_thread)
                return;
 
+       if (td->error)
+               fprintf(f_out, "fio: %s\n", td->verror);
+
        memset(&threads[td->thread_number - 1], 0, sizeof(*td));
        thread_number--;
 }
@@ -688,8 +697,18 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                char tmp[PATH_MAX];
                int len = 0;
 
-               if (td->directory && td->directory[0] != '\0')
+               if (td->directory && td->directory[0] != '\0') {
+                       if (lstat(td->directory, &sb) < 0) {
+                               log_err("fio: %s is not a directory\n", td->directory);
+                               td_verror(td, errno);
+                               return 1;
+                       }
+                       if (!S_ISDIR(sb.st_mode)) {
+                               log_err("fio: %s is not a directory\n", td->directory);
+                               return 1;
+                       }
                        len = sprintf(tmp, "%s/", td->directory);
+               }
 
                td->files = malloc(sizeof(struct fio_file) * td->nr_files);