[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/6] block/aio_task: drop aio_task_pool_wait_one() helper
From: |
Denis V. Lunev |
Subject: |
[PATCH 3/6] block/aio_task: drop aio_task_pool_wait_one() helper |
Date: |
Fri, 19 Jun 2020 13:07:05 +0300 |
It is not used outside the module.
Actually there are 2 kind of waiters:
- for a slot and
- for all tasks to finish
This patch limits external API to listed types.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Fam Zheng <fam@euphon.net>
CC: Juan Quintela <quintela@redhat.com>
CC: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
CC: Denis Plotnikov <dplotnikov@virtuozzo.com>
---
block/aio_task.c | 13 ++-----------
include/block/aio_task.h | 1 -
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/block/aio_task.c b/block/aio_task.c
index cf62e5c58b..7ba15ff41f 100644
--- a/block/aio_task.c
+++ b/block/aio_task.c
@@ -54,26 +54,17 @@ static void coroutine_fn aio_task_co(void *opaque)
qemu_co_queue_restart_all(&pool->waiters);
}
-void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool)
-{
- assert(pool->busy_tasks > 0);
-
- qemu_co_queue_wait(&pool->waiters, NULL);
-
- assert(pool->busy_tasks < pool->max_busy_tasks);
-}
-
void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool)
{
while (pool->busy_tasks >= pool->max_busy_tasks) {
- aio_task_pool_wait_one(pool);
+ qemu_co_queue_wait(&pool->waiters, NULL);
}
}
void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool)
{
while (pool->busy_tasks > 0) {
- aio_task_pool_wait_one(pool);
+ qemu_co_queue_wait(&pool->waiters, NULL);
}
}
diff --git a/include/block/aio_task.h b/include/block/aio_task.h
index 50bc1e1817..50b1c036c5 100644
--- a/include/block/aio_task.h
+++ b/include/block/aio_task.h
@@ -48,7 +48,6 @@ bool aio_task_pool_empty(AioTaskPool *pool);
void coroutine_fn aio_task_pool_start_task(AioTaskPool *pool, AioTask *task);
void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool);
-void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool);
void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool);
#endif /* BLOCK_AIO_TASK_H */
--
2.17.1
- [PATCH v5 0/6] block: seriously improve savevm performance, Denis V. Lunev, 2020/06/19
- [PATCH 4/6] block/block-backend: remove always true check from blk_save_vmstate, Denis V. Lunev, 2020/06/19
- [PATCH 3/6] block/aio_task: drop aio_task_pool_wait_one() helper,
Denis V. Lunev <=
- [PATCH 2/6] block/aio_task: allow start/wait task from any coroutine, Denis V. Lunev, 2020/06/19
- [PATCH 1/6] migration/savevm: respect qemu_fclose() error code in save_snapshot(), Denis V. Lunev, 2020/06/19
- [PATCH 6/6] block/io: improve savevm performance, Denis V. Lunev, 2020/06/19
- [PATCH 5/6] block, migration: add bdrv_finalize_vmstate helper, Denis V. Lunev, 2020/06/19
- Re: [PATCH v5 0/6] block: seriously improve savevm performance, no-reply, 2020/06/19
- [PATCH 7/6] block/io: improve loadvm performance, Denis V. Lunev, 2020/06/22