fio: provide an option for a startdelay range
[fio.git] / cconv.c
diff --git a/cconv.c b/cconv.c
index 5d575d3d72df2e28e4bb2cd211104e1f8693455f..fd8d0ad85142568b2d142948ea4b5f638f03b03f 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)
 {
@@ -27,6 +50,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        string_to_cpu(&o->name, top->name);
        string_to_cpu(&o->directory, top->directory);
        string_to_cpu(&o->filename, top->filename);
+       string_to_cpu(&o->filename_format, top->filename_format);
        string_to_cpu(&o->opendir, top->opendir);
        string_to_cpu(&o->ioengine, top->ioengine);
        string_to_cpu(&o->mmapfile, top->mmapfile);
@@ -45,6 +69,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->td_ddir = le32_to_cpu(top->td_ddir);
        o->rw_seq = le32_to_cpu(top->rw_seq);
        o->kb_base = le32_to_cpu(top->kb_base);
+       o->unit_base = le32_to_cpu(top->kb_base);
        o->ddir_seq_nr = le32_to_cpu(top->ddir_seq_nr);
        o->ddir_seq_add = le64_to_cpu(top->ddir_seq_add);
        o->iodepth = le32_to_cpu(top->iodepth);
@@ -78,14 +103,16 @@ void convert_thread_options_to_cpu(struct thread_options *o,
                o->ratemin[i] = le32_to_cpu(top->ratemin[i]);
                o->rate_iops[i] = le32_to_cpu(top->rate_iops[i]);
                o->rate_iops_min[i] = le32_to_cpu(top->rate_iops_min[i]);
+
+               o->perc_rand[i] = le32_to_cpu(top->perc_rand[i]);
        }
 
        o->ratecycle = le32_to_cpu(top->ratecycle);
        o->nr_files = le32_to_cpu(top->nr_files);
        o->open_files = le32_to_cpu(top->open_files);
        o->file_lock_mode = le32_to_cpu(top->file_lock_mode);
-       o->lockfile_batch = le32_to_cpu(top->lockfile_batch);
        o->odirect = le32_to_cpu(top->odirect);
+       o->oatomic = le32_to_cpu(top->oatomic);
        o->invalidate_cache = le32_to_cpu(top->invalidate_cache);
        o->create_serialize = le32_to_cpu(top->create_serialize);
        o->create_fsync = le32_to_cpu(top->create_fsync);
@@ -103,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);
@@ -114,12 +142,15 @@ 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->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);
        o->softrandommap = le32_to_cpu(top->softrandommap);
        o->bs_unaligned = le32_to_cpu(top->bs_unaligned);
        o->fsync_on_close = le32_to_cpu(top->fsync_on_close);
+       o->bs_is_seq_rand = le32_to_cpu(top->bs_is_seq_rand);
        o->random_distribution = le32_to_cpu(top->random_distribution);
        o->zipf_theta.u.f = fio_uint64_to_double(le64_to_cpu(top->zipf_theta.u.i));
        o->pareto_h.u.f = fio_uint64_to_double(le64_to_cpu(top->pareto_h.u.i));
@@ -135,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);
@@ -142,6 +174,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->zone_skip = le64_to_cpu(top->zone_skip);
        o->lockmem = le64_to_cpu(top->lockmem);
        o->offset_increment = le64_to_cpu(top->offset_increment);
+       o->number_ios = le64_to_cpu(top->number_ios);
 
        o->overwrite = le32_to_cpu(top->overwrite);
        o->bw_avg_time = le32_to_cpu(top->bw_avg_time);
@@ -167,6 +200,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);
@@ -193,6 +227,9 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->flow_watermark = __le32_to_cpu(top->flow_watermark);
        o->flow_sleep = le32_to_cpu(top->flow_sleep);
        o->sync_file_range = le32_to_cpu(top->sync_file_range);
+       o->latency_target = le64_to_cpu(top->latency_target);
+       o->latency_window = le64_to_cpu(top->latency_window);
+       o->latency_percentile.u.f = fio_uint64_to_double(le64_to_cpu(top->latency_percentile.u.i));
        o->compress_percentage = le32_to_cpu(top->compress_percentage);
        o->compress_chunk = le32_to_cpu(top->compress_chunk);
 
@@ -215,6 +252,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        string_to_net(top->name, o->name);
        string_to_net(top->directory, o->directory);
        string_to_net(top->filename, o->filename);
+       string_to_net(top->filename_format, o->filename_format);
        string_to_net(top->opendir, o->opendir);
        string_to_net(top->ioengine, o->ioengine);
        string_to_net(top->mmapfile, o->mmapfile);
@@ -233,6 +271,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->td_ddir = cpu_to_le32(o->td_ddir);
        top->rw_seq = cpu_to_le32(o->rw_seq);
        top->kb_base = cpu_to_le32(o->kb_base);
+       top->unit_base = cpu_to_le32(o->kb_base);
        top->ddir_seq_nr = cpu_to_le32(o->ddir_seq_nr);
        top->iodepth = cpu_to_le32(o->iodepth);
        top->iodepth_low = cpu_to_le32(o->iodepth_low);
@@ -244,8 +283,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->nr_files = cpu_to_le32(o->nr_files);
        top->open_files = cpu_to_le32(o->open_files);
        top->file_lock_mode = cpu_to_le32(o->file_lock_mode);
-       top->lockfile_batch = cpu_to_le32(o->lockfile_batch);
        top->odirect = cpu_to_le32(o->odirect);
+       top->oatomic = cpu_to_le32(o->oatomic);
        top->invalidate_cache = cpu_to_le32(o->invalidate_cache);
        top->create_serialize = cpu_to_le32(o->create_serialize);
        top->create_fsync = cpu_to_le32(o->create_fsync);
@@ -271,12 +310,15 @@ 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->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);
        top->softrandommap = cpu_to_le32(o->softrandommap);
        top->bs_unaligned = cpu_to_le32(o->bs_unaligned);
        top->fsync_on_close = cpu_to_le32(o->fsync_on_close);
+       top->bs_is_seq_rand = cpu_to_le32(o->bs_is_seq_rand);
        top->random_distribution = cpu_to_le32(o->random_distribution);
        top->zipf_theta.u.i = __cpu_to_le64(fio_double_to_uint64(o->zipf_theta.u.f));
        top->pareto_h.u.i = __cpu_to_le64(fio_double_to_uint64(o->pareto_h.u.f));
@@ -313,6 +355,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);
@@ -339,6 +382,9 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->flow_watermark = __cpu_to_le32(o->flow_watermark);
        top->flow_sleep = cpu_to_le32(o->flow_sleep);
        top->sync_file_range = cpu_to_le32(o->sync_file_range);
+       top->latency_target = __cpu_to_le64(o->latency_target);
+       top->latency_window = __cpu_to_le64(o->latency_window);
+       top->latency_percentile.u.i = __cpu_to_le64(fio_double_to_uint64(o->latency_percentile.u.f));
        top->compress_percentage = cpu_to_le32(o->compress_percentage);
        top->compress_chunk = cpu_to_le32(o->compress_chunk);
 
@@ -367,13 +413,17 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
                top->ratemin[i] = cpu_to_le32(o->ratemin[i]);
                top->rate_iops[i] = cpu_to_le32(o->rate_iops[i]);
                top->rate_iops_min[i] = cpu_to_le32(o->rate_iops_min[i]);
+
+               top->perc_rand[i] = cpu_to_le32(o->perc_rand[i]);
        }
 
        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);
@@ -386,6 +436,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->start_offset = __cpu_to_le64(o->start_offset);
        top->trim_backlog = __cpu_to_le64(o->trim_backlog);
        top->offset_increment = __cpu_to_le64(o->offset_increment);
+       top->number_ios = __cpu_to_le64(o->number_ios);
 
        for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++)
                top->percentile_list[i].u.i = __cpu_to_le64(fio_double_to_uint64(o->percentile_list[i].u.f));
@@ -414,5 +465,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));
 }