Merge branch 'atomics' of https://github.com/bvanassche/fio

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 0e65724627884df583fe1a0c4793f85929ec70b3..449bcf7b1678bdd6443aafd760970c7f8d503795 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -226,6 +226,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->zone_skip = le64_to_cpu(top->zone_skip);
        o->zone_mode = le32_to_cpu(top->zone_mode);
        o->lockmem = le64_to_cpu(top->lockmem);
+       o->offset_increment_percent = le32_to_cpu(top->offset_increment_percent);
        o->offset_increment = le64_to_cpu(top->offset_increment);
        o->number_ios = le64_to_cpu(top->number_ios);
 
@@ -235,7 +236,8 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->loops = le32_to_cpu(top->loops);
        o->mem_type = le32_to_cpu(top->mem_type);
        o->mem_align = le32_to_cpu(top->mem_align);
-       o->stonewall = le32_to_cpu(top->stonewall);
+       o->exit_what = le16_to_cpu(top->exit_what);
+       o->stonewall = le16_to_cpu(top->stonewall);
        o->new_group = le32_to_cpu(top->new_group);
        o->numjobs = le32_to_cpu(top->numjobs);
        o->cpus_allowed_policy = le32_to_cpu(top->cpus_allowed_policy);
@@ -269,6 +271,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->trim_zero = le32_to_cpu(top->trim_zero);
        o->clat_percentiles = le32_to_cpu(top->clat_percentiles);
        o->lat_percentiles = le32_to_cpu(top->lat_percentiles);
+       o->slat_percentiles = le32_to_cpu(top->slat_percentiles);
        o->percentile_precision = le32_to_cpu(top->percentile_precision);
        o->sig_figs = le32_to_cpu(top->sig_figs);
        o->continue_on_error = le32_to_cpu(top->continue_on_error);
@@ -285,6 +288,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->latency_window = le64_to_cpu(top->latency_window);
        o->max_latency = le64_to_cpu(top->max_latency);
        o->latency_percentile.u.f = fio_uint64_to_double(le64_to_cpu(top->latency_percentile.u.i));
+       o->latency_run = le32_to_cpu(top->latency_run);
        o->compress_percentage = le32_to_cpu(top->compress_percentage);
        o->compress_chunk = le32_to_cpu(top->compress_chunk);
        o->dedupe_percentage = le32_to_cpu(top->dedupe_percentage);
@@ -432,7 +436,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->loops = cpu_to_le32(o->loops);
        top->mem_type = cpu_to_le32(o->mem_type);
        top->mem_align = cpu_to_le32(o->mem_align);
-       top->stonewall = cpu_to_le32(o->stonewall);
+       top->exit_what = cpu_to_le16(o->exit_what);
+       top->stonewall = cpu_to_le16(o->stonewall);
        top->new_group = cpu_to_le32(o->new_group);
        top->numjobs = cpu_to_le32(o->numjobs);
        top->cpus_allowed_policy = cpu_to_le32(o->cpus_allowed_policy);
@@ -466,6 +471,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->trim_zero = cpu_to_le32(o->trim_zero);
        top->clat_percentiles = cpu_to_le32(o->clat_percentiles);
        top->lat_percentiles = cpu_to_le32(o->lat_percentiles);
+       top->slat_percentiles = cpu_to_le32(o->slat_percentiles);
        top->percentile_precision = cpu_to_le32(o->percentile_precision);
        top->sig_figs = cpu_to_le32(o->sig_figs);
        top->continue_on_error = cpu_to_le32(o->continue_on_error);
@@ -482,6 +488,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->latency_window = __cpu_to_le64(o->latency_window);
        top->max_latency = __cpu_to_le64(o->max_latency);
        top->latency_percentile.u.i = __cpu_to_le64(fio_double_to_uint64(o->latency_percentile.u.f));
+       top->latency_run = __cpu_to_le32(o->latency_run);
        top->compress_percentage = cpu_to_le32(o->compress_percentage);
        top->compress_chunk = cpu_to_le32(o->compress_chunk);
        top->dedupe_percentage = cpu_to_le32(o->dedupe_percentage);
@@ -566,6 +573,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->start_offset_align = __cpu_to_le64(o->start_offset_align);
        top->start_offset_percent = __cpu_to_le32(o->start_offset_percent);
        top->trim_backlog = __cpu_to_le64(o->trim_backlog);
+       top->offset_increment_percent = __cpu_to_le32(o->offset_increment_percent);
        top->offset_increment = __cpu_to_le64(o->offset_increment);
        top->number_ios = __cpu_to_le64(o->number_ios);
        top->rate_process = cpu_to_le32(o->rate_process);