cconv: convert ->log_offset on the wire

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 0d30f07d9afec245c8a48282705bd61a60749c5f..d2539753c76f7a673a93cc4b7f7f4321fa6c92bc 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -10,14 +10,40 @@ static void string_to_cpu(char **dst, const uint8_t *src)
                *dst = strdup(__src);
 }
 
-static void string_to_net(uint8_t *dst, const char *src)
+static void __string_to_net(uint8_t *dst, const char *src, size_t dst_size)
 {
-       if (src)
-               strcpy((char *) dst, src);
-       else
+       if (src) {
+               dst[dst_size - 1] = '\0';
+               strncpy((char *) dst, src, dst_size - 1);
+       } else
                dst[0] = '\0';
 }
 
+#define string_to_net(dst, src)        __string_to_net((dst), (src), sizeof(dst))
+
+static 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)
 {
@@ -54,8 +80,10 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->iodepth_batch = le32_to_cpu(top->iodepth_batch);
        o->iodepth_batch_complete = le32_to_cpu(top->iodepth_batch_complete);
        o->size = le64_to_cpu(top->size);
+       o->io_limit = le64_to_cpu(top->io_limit);
        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);
        o->file_size_low = le64_to_cpu(top->file_size_low);
        o->file_size_high = le64_to_cpu(top->file_size_high);
        o->start_offset = le64_to_cpu(top->start_offset);
@@ -119,9 +147,11 @@ 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->log_offset = le32_to_cpu(top->log_offset);
        o->norandommap = le32_to_cpu(top->norandommap);
        o->softrandommap = le32_to_cpu(top->softrandommap);
        o->bs_unaligned = le32_to_cpu(top->bs_unaligned);
@@ -142,6 +172,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);
@@ -163,6 +194,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->numjobs = le32_to_cpu(top->numjobs);
        o->cpumask_set = le32_to_cpu(top->cpumask_set);
        o->verify_cpumask_set = le32_to_cpu(top->verify_cpumask_set);
+       o->cpus_allowed_policy = le32_to_cpu(top->cpus_allowed_policy);
        o->iolog = le32_to_cpu(top->iolog);
        o->rwmixcycle = le32_to_cpu(top->rwmixcycle);
        o->nice = le32_to_cpu(top->nice);
@@ -254,6 +286,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->iodepth_batch_complete = cpu_to_le32(o->iodepth_batch_complete);
        top->size_percent = cpu_to_le32(o->size_percent);
        top->fill_device = cpu_to_le32(o->fill_device);
+       top->file_append = cpu_to_le32(o->file_append);
        top->ratecycle = cpu_to_le32(o->ratecycle);
        top->nr_files = cpu_to_le32(o->nr_files);
        top->open_files = cpu_to_le32(o->open_files);
@@ -285,9 +318,11 @@ 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->log_offset = cpu_to_le32(o->log_offset);
        top->norandommap = cpu_to_le32(o->norandommap);
        top->softrandommap = cpu_to_le32(o->softrandommap);
        top->bs_unaligned = cpu_to_le32(o->bs_unaligned);
@@ -317,6 +352,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->numjobs = cpu_to_le32(o->numjobs);
        top->cpumask_set = cpu_to_le32(o->cpumask_set);
        top->verify_cpumask_set = cpu_to_le32(o->verify_cpumask_set);
+       top->cpus_allowed_policy = cpu_to_le32(o->cpus_allowed_policy);
        top->iolog = cpu_to_le32(o->iolog);
        top->rwmixcycle = cpu_to_le32(o->rwmixcycle);
        top->nice = cpu_to_le32(o->nice);
@@ -395,8 +431,10 @@ 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->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);
@@ -438,5 +476,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));
 }