[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 8/9] fsdev: Use ThrottleDirection instread of bool is_writ
From: |
Greg Kurz |
Subject: |
Re: [PATCH v5 8/9] fsdev: Use ThrottleDirection instread of bool is_write |
Date: |
Mon, 7 Aug 2023 16:24:52 +0200 |
On Fri, 28 Jul 2023 10:20:05 +0800
zhenwei pi <pizhenwei@bytedance.com> wrote:
> 'bool is_write' style is obsolete from throttle framework, adapt
> fsdev to the new style.
>
> Cc: Greg Kurz <groug@kaod.org>
> Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
> ---
> fsdev/qemu-fsdev-throttle.c | 14 +++++++-------
> fsdev/qemu-fsdev-throttle.h | 4 ++--
> hw/9pfs/cofile.c | 4 ++--
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c
> index 1c137d6f0f..d912da906d 100644
> --- a/fsdev/qemu-fsdev-throttle.c
> +++ b/fsdev/qemu-fsdev-throttle.c
> @@ -94,22 +94,22 @@ void fsdev_throttle_init(FsThrottle *fst)
> }
> }
>
> -void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst, bool is_write,
> +void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst,
> + ThrottleDirection direction,
> struct iovec *iov, int iovcnt)
> {
> - ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
> -
> + assert(direction < THROTTLE_MAX);
> if (throttle_enabled(&fst->cfg)) {
> if (throttle_schedule_timer(&fst->ts, &fst->tt, direction) ||
> - !qemu_co_queue_empty(&fst->throttled_reqs[is_write])) {
> - qemu_co_queue_wait(&fst->throttled_reqs[is_write], NULL);
> + !qemu_co_queue_empty(&fst->throttled_reqs[direction])) {
> + qemu_co_queue_wait(&fst->throttled_reqs[direction], NULL);
> }
>
> throttle_account(&fst->ts, direction, iov_size(iov, iovcnt));
>
> - if (!qemu_co_queue_empty(&fst->throttled_reqs[is_write]) &&
> + if (!qemu_co_queue_empty(&fst->throttled_reqs[direction]) &&
> !throttle_schedule_timer(&fst->ts, &fst->tt, direction)) {
> - qemu_co_queue_next(&fst->throttled_reqs[is_write]);
> + qemu_co_queue_next(&fst->throttled_reqs[direction]);
> }
> }
> }
> diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h
> index a21aecddc7..daa8ca2494 100644
> --- a/fsdev/qemu-fsdev-throttle.h
> +++ b/fsdev/qemu-fsdev-throttle.h
> @@ -23,14 +23,14 @@ typedef struct FsThrottle {
> ThrottleState ts;
> ThrottleTimers tt;
> ThrottleConfig cfg;
> - CoQueue throttled_reqs[2];
> + CoQueue throttled_reqs[THROTTLE_MAX];
> } FsThrottle;
>
> int fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **);
>
> void fsdev_throttle_init(FsThrottle *);
>
> -void coroutine_fn fsdev_co_throttle_request(FsThrottle *, bool ,
> +void coroutine_fn fsdev_co_throttle_request(FsThrottle *, ThrottleDirection ,
> struct iovec *, int);
>
> void fsdev_throttle_cleanup(FsThrottle *);
> diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
> index 9c5344039e..71174c3e4a 100644
> --- a/hw/9pfs/cofile.c
> +++ b/hw/9pfs/cofile.c
> @@ -252,7 +252,7 @@ int coroutine_fn v9fs_co_pwritev(V9fsPDU *pdu,
> V9fsFidState *fidp,
> if (v9fs_request_cancelled(pdu)) {
> return -EINTR;
> }
> - fsdev_co_throttle_request(s->ctx.fst, true, iov, iovcnt);
> + fsdev_co_throttle_request(s->ctx.fst, THROTTLE_WRITE, iov, iovcnt);
> v9fs_co_run_in_worker(
> {
> err = s->ops->pwritev(&s->ctx, &fidp->fs, iov, iovcnt, offset);
> @@ -272,7 +272,7 @@ int coroutine_fn v9fs_co_preadv(V9fsPDU *pdu,
> V9fsFidState *fidp,
> if (v9fs_request_cancelled(pdu)) {
> return -EINTR;
> }
> - fsdev_co_throttle_request(s->ctx.fst, false, iov, iovcnt);
> + fsdev_co_throttle_request(s->ctx.fst, THROTTLE_READ, iov, iovcnt);
> v9fs_co_run_in_worker(
> {
> err = s->ops->preadv(&s->ctx, &fidp->fs, iov, iovcnt, offset);
--
Greg
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v5 8/9] fsdev: Use ThrottleDirection instread of bool is_write,
Greg Kurz <=