From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4Yk-0002qR-VM for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX4Yk-0001LT-29 for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:18 -0500 From: Kevin Wolf Date: Wed, 12 Dec 2018 14:27:09 +0100 Message-Id: <20181212132735.16080-16-kwolf@redhat.com> In-Reply-To: <20181212132735.16080-1-kwolf@redhat.com> References: <20181212132735.16080-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 15/41] file-posix: Factor out raw_thread_pool_submit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org 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 --- 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 d0102a7ec0..27be94cfe5 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1824,13 +1824,20 @@ static int aio_worker(void *arg) return ret; } =20 +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 =3D 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 =3D g_new(RawPosixAIOData, 1); - ThreadPool *pool; =20 acb->bs =3D bs; acb->aio_type =3D type; @@ -1849,8 +1856,7 @@ static int paio_submit_co_full(BlockDriverState *bs= , int fd, } =20 trace_file_paio_submit_co(offset, bytes, type); - pool =3D 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); } =20 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) { RawPosixAIOData *acb =3D g_new(RawPosixAIOData, 1); - ThreadPool *pool; =20 *acb =3D (RawPosixAIOData) { .bs =3D bs, @@ -1989,9 +1994,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, = int64_t offset, }, }; =20 - /* @bs can be NULL, bdrv_get_aio_context() returns the main context = then */ - pool =3D 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); } =20 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t of= fset, --=20 2.19.2