libaio engine: get rid of non-async behaviour with buffered IO

[fio.git] / options.c

diff --git a/options.c b/options.c
index 5bbeb34276e622cd9f1fc2f88d14664f619b8dcf..f5bc9c073c6f9f1e62a5674fbecd82b62aabe681 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;
+       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);
                }
        }
 
@@ -264,14 +278,23 @@ static int str_cpus_allowed_cb(void *data, const char *input)
 {
        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;
@@ -292,15 +315,31 @@ static int str_cpus_allowed_cb(void *data, const char *input)
                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);
-                       CPU_SET(atoi(cpu), &td->o.cpumask);
+                       fio_cpu_set(&td->o.cpumask, icpu);
                        icpu++;
                }
+               if (ret)
+                       break;
        }
 
        free(p);
-       td->o.cpumask_set = 1;
-       return 0;
+       if (!ret)
+               td->o.cpumask_set = 1;
+       return ret;
 }
 #endif