projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Detect and print when the OS doesn't support huge pages
[fio.git]
/
options.c
diff --git
a/options.c
b/options.c
index 230c47dd22b48171277bc62392f98267c930a501..94eacbaaebbb6e7ca448bfefe17b735db7c659cd 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-98,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);
+
+ p = str = strdup(input);
+
+ strip_blank_front(&str);
+ strip_blank_end(str);
- fill_cpu_mask(td->o.cpumask, *val);
+ 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)
{
@@
-294,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",
@@
-775,6
+797,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",
@@
-852,6
+880,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,
},