ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file-posix: Factor out raw_thread_pool_submit() 

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 <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2018-10-26 16:53:47 +01:00
parent d57c44d00f
commit 5d5de25005
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/file-posix.c
View File

@ -1824,13 +1824,20 @@ static int aio_worker(void *arg)
return ret; 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, static int paio_submit_co_full(BlockDriverState *bs, int fd,
int64_t offset, int fd2, int64_t offset2, int64_t offset, int fd2, int64_t offset2,
QEMUIOVector *qiov, QEMUIOVector *qiov,
int bytes, int type) int bytes, int type)
{ {
RawPosixAIOData *acb = g_new(RawPosixAIOData, 1); RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
ThreadPool *pool;
acb->bs = bs; acb->bs = bs;
acb->aio_type = type; acb->aio_type = type;
@ -1849,8 +1856,7 @@ static int paio_submit_co_full(BlockDriverState *bs, int fd,
} }
trace_file_paio_submit_co(offset, bytes, type); trace_file_paio_submit_co(offset, bytes, type);
pool = aio_get_thread_pool(bdrv_get_aio_context(bs)); return raw_thread_pool_submit(bs, aio_worker, acb);
return thread_pool_submit_co(pool, aio_worker, acb);
} }
static inline int paio_submit_co(BlockDriverState *bs, int fd, static inline int paio_submit_co(BlockDriverState *bs, int fd,
@ -1976,7 +1982,6 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
PreallocMode prealloc, Error **errp) PreallocMode prealloc, Error **errp)
{ {
RawPosixAIOData *acb = g_new(RawPosixAIOData, 1); RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
ThreadPool *pool;
*acb = (RawPosixAIOData) { *acb = (RawPosixAIOData) {
.bs = bs, .bs = bs,
@ -1989,9 +1994,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
}, },
}; };
/* @bs can be NULL, bdrv_get_aio_context() returns the main context then */ return raw_thread_pool_submit(bs, aio_worker, acb);
pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
return thread_pool_submit_co(pool, aio_worker, acb);
} }
static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset, static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,