X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=cconv.c;h=4a40ed0d647ba863a27e1f751fdf71b7ac658174;hp=41ef6265d5695dfc6546ac8dd3b0dff110600e6b;hb=3fcc6ca7f15db70b9f82df1f9065765b4cca4e9d;hpb=56e2a5fc76067c91738f7eb0efbd6ec6d349e0f2 diff --git a/cconv.c b/cconv.c index 41ef6265..4a40ed0d 100644 --- a/cconv.c +++ b/cconv.c @@ -10,15 +10,18 @@ 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'; } -void free_thread_options_to_cpu(struct thread_options *o) +#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); @@ -77,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); @@ -146,6 +151,9 @@ void convert_thread_options_to_cpu(struct thread_options *o, 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->log_gz = le32_to_cpu(top->log_gz); + o->log_gz_store = le32_to_cpu(top->log_gz_store); o->norandommap = le32_to_cpu(top->norandommap); o->softrandommap = le32_to_cpu(top->softrandommap); o->bs_unaligned = le32_to_cpu(top->bs_unaligned); @@ -166,6 +174,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); @@ -187,6 +196,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); @@ -231,6 +241,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, 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); + o->dedupe_percentage = le32_to_cpu(top->dedupe_percentage); o->trim_backlog = le64_to_cpu(top->trim_backlog); @@ -278,6 +289,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); @@ -313,6 +325,9 @@ void convert_thread_options_to_net(struct thread_options_pack *top, 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->log_gz = cpu_to_le32(o->log_gz); + top->log_gz_store = cpu_to_le32(o->log_gz_store); top->norandommap = cpu_to_le32(o->norandommap); top->softrandommap = cpu_to_le32(o->softrandommap); top->bs_unaligned = cpu_to_le32(o->bs_unaligned); @@ -342,6 +357,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); @@ -386,6 +402,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, 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); + top->dedupe_percentage = cpu_to_le32(o->dedupe_percentage); for (i = 0; i < DDIR_RWDIR_CNT; i++) { top->bs[i] = cpu_to_le32(o->bs[i]); @@ -420,8 +437,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);