steadystate: rename options->ss to options->ss_state since ss is used elsewhere to...

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 2e69320979760e81e6f48a9e27e0bae072d4d077..ebbac0aa1906c795b40ab6a13330b18c76c13f82 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -39,6 +39,7 @@ static void free_thread_options_to_cpu(struct thread_options *o)
        free(o->bw_log_file);
        free(o->lat_log_file);
        free(o->iops_log_file);
+       free(o->hist_log_file);
        free(o->replay_redirect);
        free(o->exec_prerun);
        free(o->exec_postrun);
@@ -74,6 +75,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        string_to_cpu(&o->bw_log_file, top->bw_log_file);
        string_to_cpu(&o->lat_log_file, top->lat_log_file);
        string_to_cpu(&o->iops_log_file, top->iops_log_file);
+       string_to_cpu(&o->hist_log_file, top->hist_log_file);
        string_to_cpu(&o->replay_redirect, top->replay_redirect);
        string_to_cpu(&o->exec_prerun, top->exec_prerun);
        string_to_cpu(&o->exec_postrun, top->exec_postrun);
@@ -172,6 +174,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->verify_batch = le32_to_cpu(top->verify_batch);
        o->use_thread = le32_to_cpu(top->use_thread);
        o->unlink = le32_to_cpu(top->unlink);
+       o->unlink_each_loop = le32_to_cpu(top->unlink_each_loop);
        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);
@@ -209,6 +212,10 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        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->ss_dur = le64_to_cpu(top->ss_dur);
+       o->ss_ramp_time = le64_to_cpu(top->ss_ramp_time);
+       o->ss_state = le32_to_cpu(top->ss_state);
+       o->ss_limit.u.f = fio_uint64_to_double(le64_to_cpu(top->ss_limit.u.i));
        o->zone_range = le64_to_cpu(top->zone_range);
        o->zone_size = le64_to_cpu(top->zone_size);
        o->zone_skip = le64_to_cpu(top->zone_skip);
@@ -311,6 +318,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        string_to_net(top->bw_log_file, o->bw_log_file);
        string_to_net(top->lat_log_file, o->lat_log_file);
        string_to_net(top->iops_log_file, o->iops_log_file);
+       string_to_net(top->hist_log_file, o->hist_log_file);
        string_to_net(top->replay_redirect, o->replay_redirect);
        string_to_net(top->exec_prerun, o->exec_prerun);
        string_to_net(top->exec_postrun, o->exec_postrun);
@@ -364,6 +372,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->verify_batch = cpu_to_le32(o->verify_batch);
        top->use_thread = cpu_to_le32(o->use_thread);
        top->unlink = cpu_to_le32(o->unlink);
+       top->unlink_each_loop = cpu_to_le32(o->unlink_each_loop);
        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);
@@ -508,6 +517,10 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        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->ss_dur = __cpu_to_le64(top->ss_dur);
+       top->ss_ramp_time = __cpu_to_le64(top->ss_ramp_time);
+       top->ss_state = cpu_to_le32(top->ss_state);
+       top->ss_limit.u.i = __cpu_to_le64(fio_double_to_uint64(o->ss_limit.u.f));
        top->zone_range = __cpu_to_le64(o->zone_range);
        top->zone_size = __cpu_to_le64(o->zone_size);
        top->zone_skip = __cpu_to_le64(o->zone_skip);