projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug with openfiles
[fio.git]
/
options.c
diff --git
a/options.c
b/options.c
index 5bbeb34276e622cd9f1fc2f88d14664f619b8dcf..cec7bb79d2422b19f79df258b784c0ab033fbc4b 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-246,13
+246,27
@@
static int str_cpumask_cb(void *data, unsigned int *val)
{
struct thread_data *td = data;
unsigned int i;
{
struct thread_data *td = data;
unsigned int i;
+ long max_cpu;
+ int ret;
- CPU_ZERO(&td->o.cpumask);
+ ret = fio_cpuset_init(&td->o.cpumask);
+ if (ret < 0) {
+ log_err("fio: cpuset_init failed\n");
+ td_verror(td, ret, "fio_cpuset_init");
+ return 1;
+ }
+
+ max_cpu = sysconf(_SC_NPROCESSORS_ONLN);
for (i = 0; i < sizeof(int) * 8; i++) {
if ((1 << i) & *val) {
for (i = 0; i < sizeof(int) * 8; i++) {
if ((1 << i) & *val) {
+ if (i > max_cpu) {
+ log_err("fio: CPU %d too large (max=%ld)\n", i,
+ max_cpu);
+ return 1;
+ }
dprint(FD_PARSE, "set cpu allowed %d\n", i);
dprint(FD_PARSE, "set cpu allowed %d\n", i);
-
CPU_SET(*val, &td->o.cpumask
);
+
fio_cpu_set(&td->o.cpumask, i
);
}
}
}
}
@@
-264,14
+278,23
@@
static int str_cpus_allowed_cb(void *data, const char *input)
{
struct thread_data *td = data;
char *cpu, *str, *p;
{
struct thread_data *td = data;
char *cpu, *str, *p;
+ long max_cpu;
+ int ret = 0;
- CPU_ZERO(&td->o.cpumask);
+ ret = fio_cpuset_init(&td->o.cpumask);
+ if (ret < 0) {
+ log_err("fio: cpuset_init failed\n");
+ td_verror(td, ret, "fio_cpuset_init");
+ return 1;
+ }
p = str = strdup(input);
strip_blank_front(&str);
strip_blank_end(str);
p = str = strdup(input);
strip_blank_front(&str);
strip_blank_end(str);
+ max_cpu = sysconf(_SC_NPROCESSORS_ONLN);
+
while ((cpu = strsep(&str, ",")) != NULL) {
char *str2, *cpu2;
int icpu, icpu2;
while ((cpu = strsep(&str, ",")) != NULL) {
char *str2, *cpu2;
int icpu, icpu2;
@@
-292,15
+315,31
@@
static int str_cpus_allowed_cb(void *data, const char *input)
if (icpu2 == -1)
icpu2 = icpu;
while (icpu <= icpu2) {
if (icpu2 == -1)
icpu2 = icpu;
while (icpu <= icpu2) {
+ if (icpu >= FIO_MAX_CPUS) {
+ log_err("fio: your OS only supports up to"
+ " %d CPUs\n", (int) FIO_MAX_CPUS);
+ ret = 1;
+ break;
+ }
+ if (icpu > max_cpu) {
+ log_err("fio: CPU %d too large (max=%ld)\n",
+ icpu, max_cpu);
+ ret = 1;
+ break;
+ }
+
dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
-
CPU_SET(atoi(cpu), &td->o.cpumask
);
+
fio_cpu_set(&td->o.cpumask, icpu
);
icpu++;
}
icpu++;
}
+ if (ret)
+ break;
}
free(p);
}
free(p);
- td->o.cpumask_set = 1;
- return 0;
+ if (!ret)
+ td->o.cpumask_set = 1;
+ return ret;
}
#endif
}
#endif
@@
-691,7
+730,7
@@
static struct fio_option options[] = {
.alias = "iodepth_batch_submit",
.type = FIO_OPT_INT,
.off1 = td_var_offset(iodepth_batch),
.alias = "iodepth_batch_submit",
.type = FIO_OPT_INT,
.off1 = td_var_offset(iodepth_batch),
- .help = "Number of IO to submit in one go",
+ .help = "Number of IO
buffers
to submit in one go",
.parent = "iodepth",
.minval = 1,
.def = "1",
.parent = "iodepth",
.minval = 1,
.def = "1",
@@
-700,7
+739,7
@@
static struct fio_option options[] = {
.name = "iodepth_batch_complete",
.type = FIO_OPT_INT,
.off1 = td_var_offset(iodepth_batch_complete),
.name = "iodepth_batch_complete",
.type = FIO_OPT_INT,
.off1 = td_var_offset(iodepth_batch_complete),
- .help = "Number of IO to retrieve in one go",
+ .help = "Number of IO
buffers
to retrieve in one go",
.parent = "iodepth",
.minval = 0,
.def = "1",
.parent = "iodepth",
.minval = 0,
.def = "1",
@@
-832,6
+871,10
@@
static struct fio_option options[] = {
.oval = FIO_FSERVICE_RR,
.help = "Round robin select files",
},
.oval = FIO_FSERVICE_RR,
.help = "Round robin select files",
},
+ { .ival = "sequential",
+ .oval = FIO_FSERVICE_SEQ,
+ .help = "Finish one file before moving to the next",
+ },
},
.parent = "nrfiles",
},
},
.parent = "nrfiles",
},