From 72863286d1d42529989f28ae74d6c52e9a5c3f1c Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 11 Aug 2016 21:50:59 -0600 Subject: [PATCH] steady-state: convert options across the wire Signed-off-by: Jens Axboe --- cconv.c | 10 ++++++++++ server.h | 2 +- thread_options.h | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cconv.c b/cconv.c index 8d9a0a8e..a795f1e9 100644 --- a/cconv.c +++ b/cconv.c @@ -212,6 +212,11 @@ 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 = le32_to_cpu(top->ss); + o->ss_pct = le32_to_cpu(top->ss_pct); + 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); @@ -513,6 +518,11 @@ void convert_thread_options_to_net(struct thread_options_pack *top, 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 = cpu_to_le32(top->ss); + top->ss_pct = cpu_to_le32(top->ss_pct); + 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); diff --git a/server.h b/server.h index fb384fb1..173aadce 100644 --- a/server.h +++ b/server.h @@ -38,7 +38,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 56, + FIO_SERVER_VER = 57, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, diff --git a/thread_options.h b/thread_options.h index 088819bf..f15ebef8 100644 --- a/thread_options.h +++ b/thread_options.h @@ -169,7 +169,7 @@ struct thread_options { unsigned long long start_delay_high; unsigned long long timeout; unsigned long long ramp_time; - unsigned int ss; /* TODO add to thread_options_pack */ + unsigned int ss; bool ss_pct; fio_fp64_t ss_limit; unsigned long long ss_dur; @@ -430,6 +430,11 @@ struct thread_options_pack { uint64_t start_delay_high; uint64_t timeout; uint64_t ramp_time; + uint64_t ss_dur; + uint64_t ss_ramp_time; + uint32_t ss; + uint32_t ss_pct; + fio_fp64_t ss_limit; uint32_t overwrite; uint32_t bw_avg_time; uint32_t iops_avg_time; -- 2.25.1