From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQW6V-0007gm-0Z for qemu-devel@nongnu.org; Thu, 29 Jun 2017 05:51:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQW6R-0000wf-ST for qemu-devel@nongnu.org; Thu, 29 Jun 2017 05:51:15 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:16145) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQW6R-0000u7-Ax for qemu-devel@nongnu.org; Thu, 29 Jun 2017 05:51:11 -0400 References: <1497877896-35700-1-git-send-email-pradeep.jagadeesh@huawei.com> <1497877896-35700-2-git-send-email-pradeep.jagadeesh@huawei.com> <87shisgk96.fsf@dusky.pond.sub.org> From: Pradeep Jagadeesh Message-ID: Date: Thu, 29 Jun 2017 11:50:05 +0200 MIME-Version: 1.0 In-Reply-To: <87shisgk96.fsf@dusky.pond.sub.org> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 1/5] throttle: factor out duplicate code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , Pradeep Jagadeesh Cc: eric blake , greg kurz , jani kokkonen , alberto garcia , qemu-devel@nongnu.org On 6/22/2017 4:38 PM, Markus Armbruster wrote: > Pradeep Jagadeesh writes: > >> This patch factor out the duplicate throttle code that was present in >> block and fsdev devices. >> >> Signed-off-by: Pradeep Jagadeesh >> --- >> blockdev.c | 44 +----------------------------------- >> fsdev/qemu-fsdev-throttle.c | 43 +---------------------------------- >> fsdev/qemu-fsdev-throttle.h | 1 + >> include/qemu/throttle-options.h | 4 ++++ >> util/throttle.c | 50 +++++++++++++++++++++++++++++++++++++++++ >> 5 files changed, 57 insertions(+), 85 deletions(-) >> >> diff --git a/blockdev.c b/blockdev.c >> index 6472548..5db9e5c 100644 >> --- a/blockdev.c >> +++ b/blockdev.c >> @@ -386,49 +386,7 @@ static void extract_common_blockdev_options(QemuOpts *opts, int *bdrv_flags, >> } >> >> if (throttle_cfg) { >> - throttle_config_init(throttle_cfg); >> - throttle_cfg->buckets[THROTTLE_BPS_TOTAL].avg = >> - qemu_opt_get_number(opts, "throttling.bps-total", 0); >> - throttle_cfg->buckets[THROTTLE_BPS_READ].avg = >> - qemu_opt_get_number(opts, "throttling.bps-read", 0); >> - throttle_cfg->buckets[THROTTLE_BPS_WRITE].avg = >> - qemu_opt_get_number(opts, "throttling.bps-write", 0); >> - throttle_cfg->buckets[THROTTLE_OPS_TOTAL].avg = >> - qemu_opt_get_number(opts, "throttling.iops-total", 0); >> - throttle_cfg->buckets[THROTTLE_OPS_READ].avg = >> - qemu_opt_get_number(opts, "throttling.iops-read", 0); >> - throttle_cfg->buckets[THROTTLE_OPS_WRITE].avg = >> - qemu_opt_get_number(opts, "throttling.iops-write", 0); >> - >> - throttle_cfg->buckets[THROTTLE_BPS_TOTAL].max = >> - qemu_opt_get_number(opts, "throttling.bps-total-max", 0); >> - throttle_cfg->buckets[THROTTLE_BPS_READ].max = >> - qemu_opt_get_number(opts, "throttling.bps-read-max", 0); >> - throttle_cfg->buckets[THROTTLE_BPS_WRITE].max = >> - qemu_opt_get_number(opts, "throttling.bps-write-max", 0); >> - throttle_cfg->buckets[THROTTLE_OPS_TOTAL].max = >> - qemu_opt_get_number(opts, "throttling.iops-total-max", 0); >> - throttle_cfg->buckets[THROTTLE_OPS_READ].max = >> - qemu_opt_get_number(opts, "throttling.iops-read-max", 0); >> - throttle_cfg->buckets[THROTTLE_OPS_WRITE].max = >> - qemu_opt_get_number(opts, "throttling.iops-write-max", 0); >> - >> - throttle_cfg->buckets[THROTTLE_BPS_TOTAL].burst_length = >> - qemu_opt_get_number(opts, "throttling.bps-total-max-length", 1); >> - throttle_cfg->buckets[THROTTLE_BPS_READ].burst_length = >> - qemu_opt_get_number(opts, "throttling.bps-read-max-length", 1); >> - throttle_cfg->buckets[THROTTLE_BPS_WRITE].burst_length = >> - qemu_opt_get_number(opts, "throttling.bps-write-max-length", 1); >> - throttle_cfg->buckets[THROTTLE_OPS_TOTAL].burst_length = >> - qemu_opt_get_number(opts, "throttling.iops-total-max-length", 1); >> - throttle_cfg->buckets[THROTTLE_OPS_READ].burst_length = >> - qemu_opt_get_number(opts, "throttling.iops-read-max-length", 1); >> - throttle_cfg->buckets[THROTTLE_OPS_WRITE].burst_length = >> - qemu_opt_get_number(opts, "throttling.iops-write-max-length", 1); >> - >> - throttle_cfg->op_size = >> - qemu_opt_get_number(opts, "throttling.iops-size", 0); >> - >> + throttle_parse_options(throttle_cfg, opts); >> if (!throttle_is_valid(throttle_cfg, errp)) { >> return; >> } >> diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c >> index 7ae4e86..da9c225 100644 >> --- a/fsdev/qemu-fsdev-throttle.c >> +++ b/fsdev/qemu-fsdev-throttle.c >> @@ -31,48 +31,7 @@ static void fsdev_throttle_write_timer_cb(void *opaque) >> >> void fsdev_throttle_parse_opts(QemuOpts *opts, FsThrottle *fst, Error **errp) >> { >> - throttle_config_init(&fst->cfg); >> - fst->cfg.buckets[THROTTLE_BPS_TOTAL].avg = >> - qemu_opt_get_number(opts, "throttling.bps-total", 0); >> - fst->cfg.buckets[THROTTLE_BPS_READ].avg = >> - qemu_opt_get_number(opts, "throttling.bps-read", 0); >> - fst->cfg.buckets[THROTTLE_BPS_WRITE].avg = >> - qemu_opt_get_number(opts, "throttling.bps-write", 0); >> - fst->cfg.buckets[THROTTLE_OPS_TOTAL].avg = >> - qemu_opt_get_number(opts, "throttling.iops-total", 0); >> - fst->cfg.buckets[THROTTLE_OPS_READ].avg = >> - qemu_opt_get_number(opts, "throttling.iops-read", 0); >> - fst->cfg.buckets[THROTTLE_OPS_WRITE].avg = >> - qemu_opt_get_number(opts, "throttling.iops-write", 0); >> - >> - fst->cfg.buckets[THROTTLE_BPS_TOTAL].max = >> - qemu_opt_get_number(opts, "throttling.bps-total-max", 0); >> - fst->cfg.buckets[THROTTLE_BPS_READ].max = >> - qemu_opt_get_number(opts, "throttling.bps-read-max", 0); >> - fst->cfg.buckets[THROTTLE_BPS_WRITE].max = >> - qemu_opt_get_number(opts, "throttling.bps-write-max", 0); >> - fst->cfg.buckets[THROTTLE_OPS_TOTAL].max = >> - qemu_opt_get_number(opts, "throttling.iops-total-max", 0); >> - fst->cfg.buckets[THROTTLE_OPS_READ].max = >> - qemu_opt_get_number(opts, "throttling.iops-read-max", 0); >> - fst->cfg.buckets[THROTTLE_OPS_WRITE].max = >> - qemu_opt_get_number(opts, "throttling.iops-write-max", 0); >> - >> - fst->cfg.buckets[THROTTLE_BPS_TOTAL].burst_length = >> - qemu_opt_get_number(opts, "throttling.bps-total-max-length", 1); >> - fst->cfg.buckets[THROTTLE_BPS_READ].burst_length = >> - qemu_opt_get_number(opts, "throttling.bps-read-max-length", 1); >> - fst->cfg.buckets[THROTTLE_BPS_WRITE].burst_length = >> - qemu_opt_get_number(opts, "throttling.bps-write-max-length", 1); >> - fst->cfg.buckets[THROTTLE_OPS_TOTAL].burst_length = >> - qemu_opt_get_number(opts, "throttling.iops-total-max-length", 1); >> - fst->cfg.buckets[THROTTLE_OPS_READ].burst_length = >> - qemu_opt_get_number(opts, "throttling.iops-read-max-length", 1); >> - fst->cfg.buckets[THROTTLE_OPS_WRITE].burst_length = >> - qemu_opt_get_number(opts, "throttling.iops-write-max-length", 1); >> - fst->cfg.op_size = >> - qemu_opt_get_number(opts, "throttling.iops-size", 0); >> - >> + throttle_parse_options(&fst->cfg, opts); >> throttle_is_valid(&fst->cfg, errp); >> } >> >> diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h >> index e418643..c493e83 100644 >> --- a/fsdev/qemu-fsdev-throttle.h >> +++ b/fsdev/qemu-fsdev-throttle.h >> @@ -20,6 +20,7 @@ >> #include "qemu/coroutine.h" >> #include "qapi/error.h" >> #include "qemu/throttle.h" >> +#include "qemu/throttle-options.h" > > Why? > Moved to qemu-fsdev-throttle.c >> >> typedef struct FsThrottle { >> ThrottleState ts; >> diff --git a/include/qemu/throttle-options.h b/include/qemu/throttle-options.h >> index 3133d1c..565553a 100644 >> --- a/include/qemu/throttle-options.h >> +++ b/include/qemu/throttle-options.h >> @@ -10,6 +10,8 @@ >> #ifndef THROTTLE_OPTIONS_H >> #define THROTTLE_OPTIONS_H >> >> +#include "qemu/throttle.h" >> + > > Let's avoid this include: move the ThrottleConfig typedef to > qemu/typedefs.h. OK > >> #define THROTTLE_OPTS \ >> { \ >> .name = "throttling.iops-total",\ >> @@ -89,4 +91,6 @@ >> .help = "when limiting by iops max size of an I/O in bytes",\ >> } >> >> +void throttle_parse_options(ThrottleConfig *, QemuOpts *); >> + >> #endif >> diff --git a/util/throttle.c b/util/throttle.c >> index 3570ed2..ebe9dd0 100644 >> --- a/util/throttle.c >> +++ b/util/throttle.c >> @@ -514,3 +514,53 @@ void throttle_account(ThrottleState *ts, bool is_write, uint64_t size) >> } >> } >> >> +/* parse the throttle options >> + * >> + * @opts: qemu options >> + * @throttle_cfg: throttle configuration >> + */ >> +void throttle_parse_options(ThrottleConfig *throttle_cfg, QemuOpts *opts) >> +{ >> + throttle_config_init(throttle_cfg); >> + throttle_cfg->buckets[THROTTLE_BPS_TOTAL].avg = >> + qemu_opt_get_number(opts, "throttling.bps-total", 0); >> + throttle_cfg->buckets[THROTTLE_BPS_READ].avg = >> + qemu_opt_get_number(opts, "throttling.bps-read", 0); >> + throttle_cfg->buckets[THROTTLE_BPS_WRITE].avg = >> + qemu_opt_get_number(opts, "throttling.bps-write", 0); >> + throttle_cfg->buckets[THROTTLE_OPS_TOTAL].avg = >> + qemu_opt_get_number(opts, "throttling.iops-total", 0); >> + throttle_cfg->buckets[THROTTLE_OPS_READ].avg = >> + qemu_opt_get_number(opts, "throttling.iops-read", 0); >> + throttle_cfg->buckets[THROTTLE_OPS_WRITE].avg = >> + qemu_opt_get_number(opts, "throttling.iops-write", 0); >> + >> + throttle_cfg->buckets[THROTTLE_BPS_TOTAL].max = >> + qemu_opt_get_number(opts, "throttling.bps-total-max", 0); >> + throttle_cfg->buckets[THROTTLE_BPS_READ].max = >> + qemu_opt_get_number(opts, "throttling.bps-read-max", 0); >> + throttle_cfg->buckets[THROTTLE_BPS_WRITE].max = >> + qemu_opt_get_number(opts, "throttling.bps-write-max", 0); >> + throttle_cfg->buckets[THROTTLE_OPS_TOTAL].max = >> + qemu_opt_get_number(opts, "throttling.iops-total-max", 0); >> + throttle_cfg->buckets[THROTTLE_OPS_READ].max = >> + qemu_opt_get_number(opts, "throttling.iops-read-max", 0); >> + throttle_cfg->buckets[THROTTLE_OPS_WRITE].max = >> + qemu_opt_get_number(opts, "throttling.iops-write-max", 0); >> + >> + throttle_cfg->buckets[THROTTLE_BPS_TOTAL].burst_length = >> + qemu_opt_get_number(opts, "throttling.bps-total-max-length", 1); >> + throttle_cfg->buckets[THROTTLE_BPS_READ].burst_length = >> + qemu_opt_get_number(opts, "throttling.bps-read-max-length", 1); >> + throttle_cfg->buckets[THROTTLE_BPS_WRITE].burst_length = >> + qemu_opt_get_number(opts, "throttling.bps-write-max-length", 1); >> + throttle_cfg->buckets[THROTTLE_OPS_TOTAL].burst_length = >> + qemu_opt_get_number(opts, "throttling.iops-total-max-length", 1); >> + throttle_cfg->buckets[THROTTLE_OPS_READ].burst_length = >> + qemu_opt_get_number(opts, "throttling.iops-read-max-length", 1); >> + throttle_cfg->buckets[THROTTLE_OPS_WRITE].burst_length = >> + qemu_opt_get_number(opts, "throttling.iops-write-max-length", 1); >> + >> + throttle_cfg->op_size = >> + qemu_opt_get_number(opts, "throttling.iops-size", 0); >> +} > > Looks good otherwise. >