Add ability to invoke fallocate() FALLOC_FL_KEEP_SIZE.

[fio.git] / options.c

diff --git a/options.c b/options.c
index 67d0d2ddb2ad22b8bd5789c9691fb1334476e195..bd7dc99fddeffa7c74c3d51fa945fa62fe1763e1 100644 (file)
--- a/options.c
+++ b/options.c
@@ -482,6 +482,7 @@ static int str_sfr_cb(void *data, const char *str)
 
 static int check_dir(struct thread_data *td, char *fname)
 {
+#if 0
        char file[PATH_MAX], *dir;
        int elen = 0;
 
@@ -494,7 +495,6 @@ static int check_dir(struct thread_data *td, char *fname)
        sprintf(file + elen, "%s", fname);
        dir = dirname(file);
 
-#if 0
        {
        struct stat sb;
        /*
@@ -918,7 +918,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .type   = FIO_OPT_STR_STORE,
                .off1   = td_var_offset(ioengine),
                .help   = "IO engine to use",
-               .def    = "sync",
+               .def    = FIO_PREFERRED_ENGINE,
                .posval = {
                          { .ival = "sync",
                            .help = "Use read/write",
@@ -1037,6 +1037,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        },
        {
                .name   = "fill_device",
+               .alias  = "fill_fs",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(fill_device),
                .help   = "Write until an ENOSPC error occurs",
@@ -1114,6 +1115,14 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .def    = "1",
                .parent = "rw",
        },
+       {
+               .name   = "use_os_rand",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(use_os_rand),
+               .help   = "Set to use OS random generator",
+               .def    = "0",
+               .parent = "rw",
+       },
        {
                .name   = "norandommap",
                .type   = FIO_OPT_STR_SET,
@@ -1169,12 +1178,37 @@ static struct fio_option options[FIO_MAX_OPTS] = {
 #ifdef FIO_HAVE_FALLOCATE
        {
                .name   = "fallocate",
-               .type   = FIO_OPT_BOOL,
-               .off1   = td_var_offset(fallocate),
-               .help   = "Use fallocate() when laying out files",
-               .def    = "1",
-       },
+               .type   = FIO_OPT_STR,
+               .off1   = td_var_offset(fallocate_mode),
+               .help   = "Whether pre-allocation is performed when laying out files",
+               .def    = "posix",
+               .posval = {
+                         { .ival = "none",
+                           .oval = FIO_FALLOCATE_NONE,
+                           .help = "Do not pre-allocate space",
+                         },
+                         { .ival = "posix",
+                           .oval = FIO_FALLOCATE_POSIX,
+                           .help = "Use posix_fallocate()",
+                         },
+#ifdef FIO_HAVE_LINUX_FALLOCATE
+                         { .ival = "keep",
+                           .oval = FIO_FALLOCATE_KEEP_SIZE,
+                           .help = "Use fallocate(..., FALLOC_FL_KEEP_SIZE, ...)",
+                         },
 #endif
+                         /* Compatibility with former boolean values */
+                         { .ival = "0",
+                           .oval = FIO_FALLOCATE_NONE,
+                           .help = "Alias for 'none'",
+                         },
+                         { .ival = "1",
+                           .oval = FIO_FALLOCATE_POSIX,
+                           .help = "Alias for 'posix'",
+                         },
+               },
+       },
+#endif /* FIO_HAVE_FALLOCATE */
        {
                .name   = "fadvise_hint",
                .type   = FIO_OPT_BOOL,