X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=cconv.c;h=3295824b5a26f18459fa119fbeeb00596342fb5f;hb=6599ce5a12eb08f412536f4f9345f4506e1feae0;hp=a795f1e9633011288db6c8f50909b907f84ca5cc;hpb=72863286d1d42529989f28ae74d6c52e9a5c3f1c;p=fio.git diff --git a/cconv.c b/cconv.c index a795f1e9..3295824b 100644 --- a/cconv.c +++ b/cconv.c @@ -88,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); @@ -97,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); @@ -131,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]); @@ -187,6 +187,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, 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); @@ -214,8 +215,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, 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 = le32_to_cpu(top->ss); - o->ss_pct = le32_to_cpu(top->ss_pct); + 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); @@ -235,6 +235,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, 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); + o->gpu_dev_id = le32_to_cpu(top->gpu_dev_id); o->iolog = le32_to_cpu(top->iolog); o->rwmixcycle = le32_to_cpu(top->rwmixcycle); o->nice = le32_to_cpu(top->nice); @@ -242,6 +243,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->ioprio_class = le32_to_cpu(top->ioprio_class); o->file_service_type = le32_to_cpu(top->file_service_type); o->group_reporting = le32_to_cpu(top->group_reporting); + o->stats = le32_to_cpu(top->stats); o->fadvise_hint = le32_to_cpu(top->fadvise_hint); o->fallocate_mode = le32_to_cpu(top->fallocate_mode); o->zero_buffers = le32_to_cpu(top->zero_buffers); @@ -284,6 +286,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); @@ -332,7 +338,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); @@ -384,6 +390,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); @@ -414,6 +421,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, 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); + top->gpu_dev_id = cpu_to_le32(o->gpu_dev_id); top->iolog = cpu_to_le32(o->iolog); top->rwmixcycle = cpu_to_le32(o->rwmixcycle); top->nice = cpu_to_le32(o->nice); @@ -421,6 +429,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->ioprio_class = cpu_to_le32(o->ioprio_class); top->file_service_type = cpu_to_le32(o->file_service_type); top->group_reporting = cpu_to_le32(o->group_reporting); + top->stats = cpu_to_le32(o->stats); top->fadvise_hint = cpu_to_le32(o->fadvise_hint); top->fallocate_mode = cpu_to_le32(o->fallocate_mode); top->zero_buffers = cpu_to_le32(o->zero_buffers); @@ -463,6 +472,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]); @@ -500,8 +513,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]); @@ -512,7 +525,7 @@ 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); @@ -520,8 +533,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, 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 = cpu_to_le32(top->ss); - top->ss_pct = cpu_to_le32(top->ss_pct); + 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);