Add cpus_allowed option

[fio.git] / options.c

diff --git a/options.c b/options.c
index 839af0bffbdc5f3d4e2c5c6488ef6d7debadef4b..db3279e13a0dba66293e36610b3f54621efdf792 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++)
 
        for (i = 0; i < sizeof(int) * 8; i++)

-               if ((1 << i) & cpu)
-                       CPU_SET(i, cpumask);
-#endif
+               if ((1 << i) & *val)
+                       CPU_SET(*val, &td->o.cpumask);
+
+       td->o.cpumask_set = 1;
+       return 0;

 }
 
 }
 

-static int str_cpumask_cb(void *data, unsigned int *val)
+static int str_cpus_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);

 
 

-       fill_cpu_mask(&td->o.cpumask, *val);
+       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;
        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)
 {


@@ -775,6 +794,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",