Add support for cpus_allowed_policy
[fio.git] / cconv.c
diff --git a/cconv.c b/cconv.c
index 3a6880ac1c59db1416095e357fc5b71f1b9bbb4b..357a7845e559fce6f43a46bb1a411368852d516e 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -18,6 +18,29 @@ static void string_to_net(uint8_t *dst, const char *src)
                dst[0] = '\0';
 }
 
+void free_thread_options_to_cpu(struct thread_options *o)
+{
+       free(o->description);
+       free(o->name);
+       free(o->directory);
+       free(o->filename);
+       free(o->filename_format);
+       free(o->opendir);
+       free(o->ioengine);
+       free(o->mmapfile);
+       free(o->read_iolog_file);
+       free(o->write_iolog_file);
+       free(o->bw_log_file);
+       free(o->lat_log_file);
+       free(o->iops_log_file);
+       free(o->replay_redirect);
+       free(o->exec_prerun);
+       free(o->exec_postrun);
+       free(o->ioscheduler);
+       free(o->profile);
+       free(o->cgroup);
+}
+
 void convert_thread_options_to_cpu(struct thread_options *o,
                                   struct thread_options_pack *top)
 {
@@ -107,6 +130,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->verify_offset = le32_to_cpu(top->verify_offset);
 
        memcpy(o->verify_pattern, top->verify_pattern, MAX_PATTERN_SIZE);
+       memcpy(o->buffer_pattern, top->buffer_pattern, MAX_PATTERN_SIZE);
 
        o->verify_pattern_bytes = le32_to_cpu(top->verify_pattern_bytes);
        o->verify_fatal = le32_to_cpu(top->verify_fatal);
@@ -118,7 +142,8 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->do_disk_util = le32_to_cpu(top->do_disk_util);
        o->override_sync = le32_to_cpu(top->override_sync);
        o->rand_repeatable = le32_to_cpu(top->rand_repeatable);
-       o->rand_seed = le32_to_cpu(top->rand_seed);
+       o->allrand_repeatable = le32_to_cpu(top->allrand_repeatable);
+       o->rand_seed = le64_to_cpu(top->rand_seed);
        o->use_os_rand = le32_to_cpu(top->use_os_rand);
        o->log_avg_msec = le32_to_cpu(top->log_avg_msec);
        o->norandommap = le32_to_cpu(top->norandommap);
@@ -141,6 +166,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 
        o->verify_backlog = le64_to_cpu(top->verify_backlog);
        o->start_delay = le64_to_cpu(top->start_delay);
+       o->start_delay_high = le64_to_cpu(top->start_delay_high);
        o->timeout = le64_to_cpu(top->timeout);
        o->ramp_time = le64_to_cpu(top->ramp_time);
        o->zone_range = le64_to_cpu(top->zone_range);
@@ -162,6 +188,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->numjobs = le32_to_cpu(top->numjobs);
        o->cpumask_set = le32_to_cpu(top->cpumask_set);
        o->verify_cpumask_set = le32_to_cpu(top->verify_cpumask_set);
+       o->cpus_allowed_policy = le32_to_cpu(top->cpus_allowed_policy);
        o->iolog = le32_to_cpu(top->iolog);
        o->rwmixcycle = le32_to_cpu(top->rwmixcycle);
        o->nice = le32_to_cpu(top->nice);
@@ -174,6 +201,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->zero_buffers = le32_to_cpu(top->zero_buffers);
        o->refill_buffers = le32_to_cpu(top->refill_buffers);
        o->scramble_buffers = le32_to_cpu(top->scramble_buffers);
+       o->buffer_pattern_bytes = le32_to_cpu(top->buffer_pattern_bytes);
        o->time_based = le32_to_cpu(top->time_based);
        o->disable_lat = le32_to_cpu(top->disable_lat);
        o->disable_clat = le32_to_cpu(top->disable_clat);
@@ -283,7 +311,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->do_disk_util = cpu_to_le32(o->do_disk_util);
        top->override_sync = cpu_to_le32(o->override_sync);
        top->rand_repeatable = cpu_to_le32(o->rand_repeatable);
-       top->rand_seed = cpu_to_le32(o->rand_seed);
+       top->allrand_repeatable = cpu_to_le32(o->allrand_repeatable);
+       top->rand_seed = __cpu_to_le64(o->rand_seed);
        top->use_os_rand = cpu_to_le32(o->use_os_rand);
        top->log_avg_msec = cpu_to_le32(o->log_avg_msec);
        top->norandommap = cpu_to_le32(o->norandommap);
@@ -315,6 +344,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->numjobs = cpu_to_le32(o->numjobs);
        top->cpumask_set = cpu_to_le32(o->cpumask_set);
        top->verify_cpumask_set = cpu_to_le32(o->verify_cpumask_set);
+       top->cpus_allowed_policy = cpu_to_le32(o->cpus_allowed_policy);
        top->iolog = cpu_to_le32(o->iolog);
        top->rwmixcycle = cpu_to_le32(o->rwmixcycle);
        top->nice = cpu_to_le32(o->nice);
@@ -327,6 +357,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->zero_buffers = cpu_to_le32(o->zero_buffers);
        top->refill_buffers = cpu_to_le32(o->refill_buffers);
        top->scramble_buffers = cpu_to_le32(o->scramble_buffers);
+       top->buffer_pattern_bytes = cpu_to_le32(o->buffer_pattern_bytes);
        top->time_based = cpu_to_le32(o->time_based);
        top->disable_lat = cpu_to_le32(o->disable_lat);
        top->disable_clat = cpu_to_le32(o->disable_clat);
@@ -389,10 +420,12 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        }
 
        memcpy(top->verify_pattern, o->verify_pattern, MAX_PATTERN_SIZE);
+       memcpy(top->buffer_pattern, o->buffer_pattern, MAX_PATTERN_SIZE);
 
        top->size = __cpu_to_le64(o->size);
        top->verify_backlog = __cpu_to_le64(o->verify_backlog);
        top->start_delay = __cpu_to_le64(o->start_delay);
+       top->start_delay_high = __cpu_to_le64(o->start_delay_high);
        top->timeout = __cpu_to_le64(o->timeout);
        top->ramp_time = __cpu_to_le64(o->ramp_time);
        top->zone_range = __cpu_to_le64(o->zone_range);
@@ -434,5 +467,7 @@ int fio_test_cconv(struct thread_options *__o)
        convert_thread_options_to_cpu(&o, &top1);
        convert_thread_options_to_net(&top2, &o);
 
+       free_thread_options_to_cpu(&o);
+
        return memcmp(&top1, &top2, sizeof(top1));
 }