Revamp file locking

[fio.git] / options.c

diff --git a/options.c b/options.c
index 055fbab7a14180a91062635a4176a9603b0fd8d2..bb77683d06c0cbba39cdfa7069f7d1b22d1b400a 100644 (file)
--- a/options.c
+++ b/options.c
@@ -251,7 +251,6 @@ static int str_cpus_allowed_cb(void *data, const char *input)
 
        free(p);
        td->o.cpumask_set = 1;
-       exit(0);
        return 0;
 }
 #endif
@@ -333,27 +332,12 @@ static int str_verify_offset_cb(void *data, unsigned int *off)
        return 0;
 }
 
-static int str_verify_cb(void *data, const char *mem)
+static int str_verify_pattern_cb(void *data, unsigned int *off)
 {
        struct thread_data *td = data;
-       unsigned int nr, msb;
-       char *pat;
+       unsigned int msb;
 
-       if (td->o.verify != VERIFY_PATTERN)
-               return 0;
-
-       pat = get_opt_postfix(mem);
-       if (!pat) {
-               log_err("fio: missing pattern\n");
-               return 1;
-       }
-
-       if (strstr(pat, "0x") || strstr(pat, "0X"))
-               nr = strtol(pat, NULL, 16);
-       else
-               nr = strtol(pat, NULL, 16);
-
-       msb = fls(nr);
+       msb = fls(*off);
        if (msb <= 8)
                td->o.verify_pattern_bytes = 1;
        else if (msb <= 16)
@@ -363,7 +347,19 @@ static int str_verify_cb(void *data, const char *mem)
        else
                td->o.verify_pattern_bytes = 4;
 
-       td->o.verify_pattern = nr;
+       td->o.verify_pattern = *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;
 }
 
@@ -400,6 +396,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,
@@ -455,6 +475,9 @@ static struct fio_option options[] = {
                          { .ival = "psync",
                            .help = "Use pread/pwrite",
                          },
+                         { .ival = "vsync",
+                            .help = "Use readv/writev",
+                         },
 #ifdef FIO_HAVE_LIBAIO
                          { .ival = "libaio",
                            .help = "Linux native asynchronous IO",
@@ -519,6 +542,8 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(iodepth_batch),
                .help   = "Number of IO to submit in one go",
                .parent = "iodepth",
+               .minval = 1,
+               .def    = "1",
        },
        {
                .name   = "iodepth_low",
@@ -534,6 +559,13 @@ static struct fio_option options[] = {
                .minval = 1,
                .help   = "Total size of device or files",
        },
+       {
+               .name   = "fill_device",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(fill_device),
+               .help   = "Write until an ENOSPC error occurs",
+               .def    = "0",
+       },
        {
                .name   = "filesize",
                .type   = FIO_OPT_STR_VAL,
@@ -745,7 +777,6 @@ static struct fio_option options[] = {
                .name   = "verify",
                .type   = FIO_OPT_STR,
                .off1   = td_var_offset(verify),
-               .cb     = str_verify_cb,
                .help   = "Verify data written",
                .def    = "0",
                .posval = {
@@ -785,10 +816,6 @@ static struct fio_option options[] = {
                            .oval = VERIFY_META,
                            .help = "Use io information",
                          },
-                         { .ival = "pattern",
-                           .oval = VERIFY_PATTERN,
-                           .help = "Verify a specific buffer pattern",
-                         },
                          {
                            .ival = "null",
                            .oval = VERIFY_NULL,
@@ -828,6 +855,13 @@ static struct fio_option options[] = {
                .cb     = str_verify_offset_cb, 
                .parent = "verify",
        },
+       {
+               .name   = "verify_pattern",
+               .type   = FIO_OPT_INT,
+               .cb     = str_verify_pattern_cb,
+               .help   = "Fill pattern for IO buffers",
+               .parent = "verify",
+       },
        {
                .name   = "verify_fatal",
                .type   = FIO_OPT_BOOL,
@@ -1120,7 +1154,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "hugepage-size",
-               .type   = FIO_OPT_STR_VAL,
+               .type   = FIO_OPT_STR_VAL_INT,
                .off1   = td_var_offset(hugepage_size),
                .help   = "When using hugepages, specify size of each page",
                .def    = __stringify(FIO_HUGE_PAGE),