X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=cconv.c;h=b329bf47be991098180a14b9f1b158f6be5ca9b0;hp=ac826a3038c91bb3c4a23676227e2fc2ba5e076d;hb=f227e2b61ffb099019e760b0c6bbacb17fa848c4;hpb=20fdc81cee61c3eb42ff65251f9d9963adf841ed diff --git a/cconv.c b/cconv.c index ac826a30..b329bf47 100644 --- 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); @@ -86,7 +88,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->unit_base = le32_to_cpu(top->unit_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); @@ -95,7 +97,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->iodepth_batch_complete_min = le32_to_cpu(top->iodepth_batch_complete_min); o->iodepth_batch_complete_max = le32_to_cpu(top->iodepth_batch_complete_max); o->size = le64_to_cpu(top->size); - o->io_limit = le64_to_cpu(top->io_limit); + o->io_size = le64_to_cpu(top->io_size); o->size_percent = le32_to_cpu(top->size_percent); o->fill_device = le32_to_cpu(top->fill_device); o->file_append = le32_to_cpu(top->file_append); @@ -129,8 +131,8 @@ void convert_thread_options_to_cpu(struct thread_options *o, } o->rwmix[i] = le32_to_cpu(top->rwmix[i]); - o->rate[i] = le32_to_cpu(top->rate[i]); - o->ratemin[i] = le32_to_cpu(top->ratemin[i]); + o->rate[i] = le64_to_cpu(top->rate[i]); + o->ratemin[i] = le64_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]); @@ -172,16 +174,20 @@ 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); o->allrand_repeatable = le32_to_cpu(top->allrand_repeatable); o->rand_seed = le64_to_cpu(top->rand_seed); o->log_avg_msec = le32_to_cpu(top->log_avg_msec); + o->log_hist_msec = le32_to_cpu(top->log_hist_msec); + o->log_hist_coarseness = le32_to_cpu(top->log_hist_coarseness); o->log_max = le32_to_cpu(top->log_max); o->log_offset = le32_to_cpu(top->log_offset); o->log_gz = le32_to_cpu(top->log_gz); o->log_gz_store = le32_to_cpu(top->log_gz_store); + o->log_unix_epoch = le32_to_cpu(top->log_unix_epoch); o->norandommap = le32_to_cpu(top->norandommap); o->softrandommap = le32_to_cpu(top->softrandommap); o->bs_unaligned = le32_to_cpu(top->bs_unaligned); @@ -207,6 +213,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); @@ -274,6 +284,10 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->replay_align = le32_to_cpu(top->replay_align); o->replay_scale = le32_to_cpu(top->replay_scale); o->per_job_logs = le32_to_cpu(top->per_job_logs); + o->write_bw_log = le32_to_cpu(top->write_bw_log); + o->write_lat_log = le32_to_cpu(top->write_lat_log); + o->write_iops_log = le32_to_cpu(top->write_iops_log); + o->write_hist_log = le32_to_cpu(top->write_hist_log); o->trim_backlog = le64_to_cpu(top->trim_backlog); o->rate_process = le32_to_cpu(top->rate_process); @@ -309,6 +323,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); @@ -321,7 +336,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->unit_base = cpu_to_le32(o->unit_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); @@ -362,6 +377,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); @@ -372,6 +388,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->log_offset = cpu_to_le32(o->log_offset); top->log_gz = cpu_to_le32(o->log_gz); top->log_gz_store = cpu_to_le32(o->log_gz_store); + top->log_unix_epoch = cpu_to_le32(o->log_unix_epoch); top->norandommap = cpu_to_le32(o->norandommap); top->softrandommap = cpu_to_le32(o->softrandommap); top->bs_unaligned = cpu_to_le32(o->bs_unaligned); @@ -451,6 +468,10 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->replay_align = cpu_to_le32(o->replay_align); top->replay_scale = cpu_to_le32(o->replay_scale); top->per_job_logs = cpu_to_le32(o->per_job_logs); + top->write_bw_log = cpu_to_le32(o->write_bw_log); + top->write_lat_log = cpu_to_le32(o->write_lat_log); + top->write_iops_log = cpu_to_le32(o->write_iops_log); + top->write_hist_log = cpu_to_le32(o->write_hist_log); for (i = 0; i < DDIR_RWDIR_CNT; i++) { top->bs[i] = cpu_to_le32(o->bs[i]); @@ -488,8 +509,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top, } top->rwmix[i] = cpu_to_le32(o->rwmix[i]); - top->rate[i] = cpu_to_le32(o->rate[i]); - top->ratemin[i] = cpu_to_le32(o->ratemin[i]); + top->rate[i] = cpu_to_le64(o->rate[i]); + top->ratemin[i] = cpu_to_le64(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]); @@ -500,12 +521,16 @@ void convert_thread_options_to_net(struct thread_options_pack *top, memcpy(top->buffer_pattern, o->buffer_pattern, MAX_PATTERN_SIZE); top->size = __cpu_to_le64(o->size); - top->io_limit = __cpu_to_le64(o->io_limit); + top->io_size = __cpu_to_le64(o->io_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->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);