[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 02/12] file-posix: Factor out raw_thread_pool_submit
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 02/12] file-posix: Factor out raw_thread_pool_submit() |
Date: |
Wed, 31 Oct 2018 22:56:12 +0100 |
Getting the thread pool of the AioContext of a block node and scheduling
some work in it is an operation that is already done twice, and we'll
get more instances. Factor it out into a separate function.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/file-posix.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 68cea7685a..28eb55c29e 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1803,13 +1803,20 @@ static int aio_worker(void *arg)
return ret;
}
+static int coroutine_fn raw_thread_pool_submit(BlockDriverState *bs,
+ ThreadPoolFunc func, void *arg)
+{
+ /* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
+ ThreadPool *pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
+ return thread_pool_submit_co(pool, func, arg);
+}
+
static int paio_submit_co_full(BlockDriverState *bs, int fd,
int64_t offset, int fd2, int64_t offset2,
QEMUIOVector *qiov,
int bytes, int type)
{
RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
- ThreadPool *pool;
acb->bs = bs;
acb->aio_type = type;
@@ -1828,8 +1835,7 @@ static int paio_submit_co_full(BlockDriverState *bs, int
fd,
}
trace_file_paio_submit_co(offset, bytes, type);
- pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
- return thread_pool_submit_co(pool, aio_worker, acb);
+ return raw_thread_pool_submit(bs, aio_worker, acb);
}
static inline int paio_submit_co(BlockDriverState *bs, int fd,
@@ -1959,7 +1965,6 @@ raw_regular_truncate(BlockDriverState *bs, int fd,
int64_t offset,
PreallocMode prealloc, Error **errp)
{
RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
- ThreadPool *pool;
*acb = (RawPosixAIOData) {
.bs = bs,
@@ -1972,9 +1977,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd,
int64_t offset,
},
};
- /* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
- pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
- return thread_pool_submit_co(pool, aio_worker, acb);
+ return raw_thread_pool_submit(bs, aio_worker, acb);
}
static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
--
2.19.1
- [Qemu-block] [PATCH 00/12] file-posix: Simplify delegation to worker thread, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 04/12] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 06/12] file-posix: Avoid aio_worker() for QEMU_AIO_DISCARD, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 07/12] file-posix: Avoid aio_worker() for QEMU_AIO_FLUSH, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 02/12] file-posix: Factor out raw_thread_pool_submit(),
Kevin Wolf <=
- [Qemu-block] [PATCH 03/12] file-posix: Avoid aio_worker() for QEMU_AIO_TRUNCATE, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 05/12] file-posix: Avoid aio_worker() for QEMU_AIO_WRITE_ZEROES, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 01/12] file-posix: Reorganise RawPosixAIOData, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 10/12] file-posix: Remove paio_submit_co(), Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 09/12] file-posix: Avoid aio_worker() for QEMU_AIO_READ/WRITE, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 11/12] file-posix: Switch to .bdrv_co_ioctl, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 08/12] file-posix: Move read/write operation logic out of aio_worker(), Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 12/12] file-posix: Avoid aio_worker() for QEMU_AIO_IOCTL, Kevin Wolf, 2018/10/31