X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=cconv.c;h=ae34e5490672925bae4bfbdd07a13da9db4ecbd3;hp=a9b404a6e0e62857f89dc6b91a6885cb8b5fba5d;hb=b0df7176176935b4d39fd196ad35f046bbe10333;hpb=9746fdbbd89cb202ecf2ee402b79ef215390eaea

diff --git a/cconv.c b/cconv.c
index a9b404a6..ae34e549 100644
--- a/cconv.c
+++ b/cconv.c
@@ -29,6 +29,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	string_to_cpu(&o->filename, top->filename);
 	string_to_cpu(&o->opendir, top->opendir);
 	string_to_cpu(&o->ioengine, top->ioengine);
+	string_to_cpu(&o->mmapfile, top->mmapfile);
 	string_to_cpu(&o->read_iolog_file, top->read_iolog_file);
 	string_to_cpu(&o->write_iolog_file, top->write_iolog_file);
 	string_to_cpu(&o->bw_log_file, top->bw_log_file);
@@ -111,9 +112,6 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	o->override_sync = le32_to_cpu(top->override_sync);
 	o->rand_repeatable = le32_to_cpu(top->rand_repeatable);
 	o->use_os_rand = le32_to_cpu(top->use_os_rand);
-	o->write_lat_log = le32_to_cpu(top->write_lat_log);
-	o->write_bw_log = le32_to_cpu(top->write_bw_log);
-	o->write_iops_log = le32_to_cpu(top->write_iops_log);
 	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);
@@ -135,6 +133,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	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);
+	o->lockmem = le64_to_cpu(top->lockmem);
 	o->offset_increment = le64_to_cpu(top->offset_increment);
 
 	o->overwrite = le32_to_cpu(top->overwrite);
@@ -151,6 +150,8 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	o->iolog = le32_to_cpu(top->iolog);
 	o->rwmixcycle = le32_to_cpu(top->rwmixcycle);
 	o->nice = le32_to_cpu(top->nice);
+	o->ioprio = le32_to_cpu(top->ioprio);
+	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->fadvise_hint = le32_to_cpu(top->fadvise_hint);
@@ -173,8 +174,6 @@ 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->overwrite_plist = le32_to_cpu(top->overwrite_plist);
-	o->cpuload = le32_to_cpu(top->cpuload);
-	o->cpucycle = le32_to_cpu(top->cpucycle);
 	o->continue_on_error = le32_to_cpu(top->continue_on_error);
 	o->cgroup_weight = le32_to_cpu(top->cgroup_weight);
 	o->cgroup_nodelete = le32_to_cpu(top->cgroup_nodelete);
@@ -193,8 +192,8 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++)
 		o->percentile_list[i].u.f = fio_uint64_to_double(le64_to_cpu(top->percentile_list[i].u.i));
 #if 0
-        uint8_t cpumask[FIO_TOP_STR_MAX];
-        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
+	uint8_t cpumask[FIO_TOP_STR_MAX];
+	uint8_t verify_cpumask[FIO_TOP_STR_MAX];
 #endif
 }
 
@@ -209,6 +208,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	string_to_net(top->filename, o->filename);
 	string_to_net(top->opendir, o->opendir);
 	string_to_net(top->ioengine, o->ioengine);
+	string_to_net(top->mmapfile, o->mmapfile);
 	string_to_net(top->read_iolog_file, o->read_iolog_file);
 	string_to_net(top->write_iolog_file, o->write_iolog_file);
 	string_to_net(top->bw_log_file, o->bw_log_file);
@@ -260,9 +260,6 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->override_sync = cpu_to_le32(o->override_sync);
 	top->rand_repeatable = cpu_to_le32(o->rand_repeatable);
 	top->use_os_rand = cpu_to_le32(o->use_os_rand);
-	top->write_lat_log = cpu_to_le32(o->write_lat_log);
-	top->write_bw_log = cpu_to_le32(o->write_bw_log);
-	top->write_iops_log = cpu_to_le32(o->write_iops_log);
 	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);
@@ -290,6 +287,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->iolog = cpu_to_le32(o->iolog);
 	top->rwmixcycle = cpu_to_le32(o->rwmixcycle);
 	top->nice = cpu_to_le32(o->nice);
+	top->ioprio = cpu_to_le32(o->ioprio);
+	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->fadvise_hint = cpu_to_le32(o->fadvise_hint);
@@ -312,8 +311,6 @@ 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->overwrite_plist = cpu_to_le32(o->overwrite_plist);
-	top->cpuload = cpu_to_le32(o->cpuload);
-	top->cpucycle = cpu_to_le32(o->cpucycle);
 	top->continue_on_error = cpu_to_le32(o->continue_on_error);
 	top->cgroup_weight = cpu_to_le32(o->cgroup_weight);
 	top->cgroup_nodelete = cpu_to_le32(o->cgroup_nodelete);
@@ -364,6 +361,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	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);
+	top->lockmem = __cpu_to_le64(o->lockmem);
 	top->ddir_seq_add = __cpu_to_le64(o->ddir_seq_add);
 	top->file_size_low = __cpu_to_le64(o->file_size_low);
 	top->file_size_high = __cpu_to_le64(o->file_size_high);
@@ -374,8 +372,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	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));
 #if 0
-        uint8_t cpumask[FIO_TOP_STR_MAX];
-        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
+	uint8_t cpumask[FIO_TOP_STR_MAX];
+	uint8_t verify_cpumask[FIO_TOP_STR_MAX];
 #endif
 
 }