{
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) {
+ 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);
- CPU_SET(*val, &td->o.cpumask);
+ fio_cpu_set(&td->o.cpumask, i);
}
}
{
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);
+ max_cpu = sysconf(_SC_NPROCESSORS_ONLN);
+
while ((cpu = strsep(&str, ",")) != NULL) {
char *str2, *cpu2;
int icpu, icpu2;
if (icpu2 == -1)
icpu2 = icpu;
while (icpu <= icpu2) {
- if (icpu >= CPU_SETSIZE) {
+ if (icpu >= FIO_MAX_CPUS) {
log_err("fio: your OS only supports up to"
- " %d CPUs\n", (int) CPU_SETSIZE);
+ " %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);
- CPU_SET(atoi(cpu), &td->o.cpumask);
+ fio_cpu_set(&td->o.cpumask, icpu);
icpu++;
}
if (ret)