Non-linux Makefile updates

[fio.git] / options.c

diff --git a/options.c b/options.c
index ead31ace29c00fb88247ea82ec76502edafb582a..ba57e4469d4ab4baf202b51c47702614b767941e 100644 (file)
--- a/options.c
+++ b/options.c
@@ -274,8 +274,14 @@ static int check_dir(struct thread_data *td, char *fname)
 {
        char file[PATH_MAX], *dir;
        struct stat sb;
+       int elen = 0;
 
-       strcpy(file, fname);
+       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) {
@@ -982,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",
@@ -1213,6 +1215,12 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(zero_buffers),
                .help   = "Init IO buffers to all zeroes",
        },
+       {
+               .name   = "refill_buffers",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(refill_buffers),
+               .help   = "Refill IO buffers on every IO submit",
+       },
 #ifdef FIO_HAVE_DISK_UTIL
        {
                .name   = "disk_util",