projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add crc16 verify type
[fio.git]
/
options.c
diff --git
a/options.c
b/options.c
index 7a81880a200e03f3e10c3637045a94aa3bcafb37..cf42a6da83f1114f202f148e4a7722c25726435e 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-64,6
+64,13
@@
static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
static int str_prioclass_cb(void *data, unsigned int *val)
{
struct thread_data *td = data;
static int str_prioclass_cb(void *data, unsigned int *val)
{
struct thread_data *td = data;
+ unsigned short mask;
+
+ /*
+ * mask off old class bits, str_prio_cb() may have set a default class
+ */
+ mask = (1 << IOPRIO_CLASS_SHIFT) - 1;
+ td->ioprio &= mask;
td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
return 0;
td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
return 0;
@@
-74,6
+81,13
@@
static int str_prio_cb(void *data, unsigned int *val)
struct thread_data *td = data;
td->ioprio |= *val;
struct thread_data *td = data;
td->ioprio |= *val;
+
+ /*
+ * If no class is set, assume BE
+ */
+ if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
+ td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+
return 0;
}
#endif
return 0;
}
#endif
@@
-84,27
+98,46
@@
static int str_exitall_cb(void)
return 0;
}
return 0;
}
-static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
-{
#ifdef FIO_HAVE_CPU_AFFINITY
#ifdef FIO_HAVE_CPU_AFFINITY
+static int str_cpumask_cb(void *data, unsigned int *val)
+{
+ struct thread_data *td = data;
unsigned int i;
unsigned int i;
- CPU_ZERO(&cpumask);
+ CPU_ZERO(&
td->o.
cpumask);
- for (i = 0; i < sizeof(int) * 8; i++) {
- if ((1 << i) & cpu)
- CPU_SET(i, &cpumask);
- }
-#endif
+ for (i = 0; i < sizeof(int) * 8; i++)
+ if ((1 << i) & *val)
+ CPU_SET(*val, &td->o.cpumask);
+
+ td->o.cpumask_set = 1;
+ return 0;
}
}
-static int str_cpu
mask_cb(void *data, unsigned int *val
)
+static int str_cpu
s_allowed_cb(void *data, const char *input
)
{
struct thread_data *td = data;
{
struct thread_data *td = data;
+ char *cpu, *str, *p;
+
+ CPU_ZERO(&td->o.cpumask);
- fill_cpu_mask(td->o.cpumask, *val);
+ p = str = strdup(input);
+
+ strip_blank_front(&str);
+ strip_blank_end(str);
+
+ while ((cpu = strsep(&str, ",")) != NULL) {
+ if (!strlen(cpu))
+ break;
+ CPU_SET(atoi(cpu), &td->o.cpumask);
+ }
+
+ free(p);
+ td->o.cpumask_set = 1;
+ exit(0);
return 0;
}
return 0;
}
+#endif
static int str_fst_cb(void *data, const char *str)
{
static int str_fst_cb(void *data, const char *str)
{
@@
-280,6
+313,9
@@
static struct fio_option options[] = {
{ .ival = "splice",
.help = "splice/vmsplice based IO",
},
{ .ival = "splice",
.help = "splice/vmsplice based IO",
},
+ { .ival = "netsplice",
+ .help = "splice/vmsplice to/from the network",
+ },
#endif
#ifdef FIO_HAVE_SGIO
{ .ival = "sg",
#endif
#ifdef FIO_HAVE_SGIO
{ .ival = "sg",
@@
-333,6
+369,7
@@
static struct fio_option options[] = {
.name = "size",
.type = FIO_OPT_STR_VAL,
.off1 = td_var_offset(size),
.name = "size",
.type = FIO_OPT_STR_VAL,
.off1 = td_var_offset(size),
+ .minval = 1,
.help = "Total size of device or files",
},
{
.help = "Total size of device or files",
},
{
@@
-340,6
+377,7
@@
static struct fio_option options[] = {
.type = FIO_OPT_STR_VAL,
.off1 = td_var_offset(file_size_low),
.off2 = td_var_offset(file_size_high),
.type = FIO_OPT_STR_VAL,
.off1 = td_var_offset(file_size_low),
.off2 = td_var_offset(file_size_high),
+ .minval = 1,
.help = "Size of individual files",
},
{
.help = "Size of individual files",
},
{
@@
-348,6
+386,7
@@
static struct fio_option options[] = {
.type = FIO_OPT_STR_VAL_INT,
.off1 = td_var_offset(bs[DDIR_READ]),
.off2 = td_var_offset(bs[DDIR_WRITE]),
.type = FIO_OPT_STR_VAL_INT,
.off1 = td_var_offset(bs[DDIR_READ]),
.off2 = td_var_offset(bs[DDIR_WRITE]),
+ .minval = 1,
.help = "Block size unit",
.def = "4k",
},
.help = "Block size unit",
.def = "4k",
},
@@
-359,6
+398,7
@@
static struct fio_option options[] = {
.off2 = td_var_offset(max_bs[DDIR_READ]),
.off3 = td_var_offset(min_bs[DDIR_WRITE]),
.off4 = td_var_offset(max_bs[DDIR_WRITE]),
.off2 = td_var_offset(max_bs[DDIR_READ]),
.off3 = td_var_offset(min_bs[DDIR_WRITE]),
.off4 = td_var_offset(max_bs[DDIR_WRITE]),
+ .minval = 1,
.help = "Set block size range (in more detail than bs)",
},
{
.help = "Set block size range (in more detail than bs)",
},
{
@@
-533,6
+573,10
@@
static struct fio_option options[] = {
.oval = VERIFY_CRC32,
.help = "Use crc32 checksums for verification",
},
.oval = VERIFY_CRC32,
.help = "Use crc32 checksums for verification",
},
+ { .ival = "crc16",
+ .oval = VERIFY_CRC16,
+ .help = "Use crc16 checksums for verification",
+ },
{ .ival = "md5",
.oval = VERIFY_MD5,
.help = "Use md5 checksums for verification",
{ .ival = "md5",
.oval = VERIFY_MD5,
.help = "Use md5 checksums for verification",
@@
-761,6
+805,12
@@
static struct fio_option options[] = {
.cb = str_cpumask_cb,
.help = "CPU affinity mask",
},
.cb = str_cpumask_cb,
.help = "CPU affinity mask",
},
+ {
+ .name = "cpus_allowed",
+ .type = FIO_OPT_STR,
+ .cb = str_cpus_allowed_cb,
+ .help = "Set CPUs allowed",
+ },
#endif
{
.name = "end_fsync",
#endif
{
.name = "end_fsync",
@@
-838,6
+888,15
@@
static struct fio_option options[] = {
.off1 = td_var_offset(zero_buffers),
.help = "Init IO buffers to all zeroes",
},
.off1 = td_var_offset(zero_buffers),
.help = "Init IO buffers to all zeroes",
},
+#ifdef FIO_HAVE_DISK_UTIL
+ {
+ .name = "disk_util",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(do_disk_util),
+ .help = "Log disk utilization stats",
+ .def = "1",
+ },
+#endif
{
.name = NULL,
},
{
.name = NULL,
},