aboutsummaryrefslogtreecommitdiff
path: root/util/aio-posix.c
diff options
context:
space:
mode:
authorJie Wang <wangjie88@huawei.com>2018-05-17 08:42:43 +0800
committerFam Zheng <famz@redhat.com>2018-05-18 17:09:54 +0800
commitcd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5 (patch)
treeb2f081c485e1856e785dc3f20164986751c9e3bf /util/aio-posix.c
parent9d5e546af0a8500c0bde312c8dea6037428c655d (diff)
downloadqemu-cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5.zip
qemu-cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5.tar.gz
qemu-cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5.tar.bz2
iothread: fix epollfd leak in the process of delIOThread
When we call addIOThread, the epollfd created in aio_context_setup, but not close it in the process of delIOThread, so the epollfd will leak. Reorder the code in aio_epoll_disable and reuse it. Signed-off-by: Jie Wang <wangjie88@huawei.com> Message-Id: <1526517763-11108-1-git-send-email-wangjie88@huawei.com> Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> [Mention change to aio_epoll_disable in commit message. - Fam] Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'util/aio-posix.c')
-rw-r--r--util/aio-posix.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/util/aio-posix.c b/util/aio-posix.c
index d8f0cb4..118bf57 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -45,11 +45,11 @@ struct AioHandler
static void aio_epoll_disable(AioContext *ctx)
{
- ctx->epoll_available = false;
- if (!ctx->epoll_enabled) {
+ ctx->epoll_enabled = false;
+ if (!ctx->epoll_available) {
return;
}
- ctx->epoll_enabled = false;
+ ctx->epoll_available = false;
close(ctx->epollfd);
}
@@ -713,6 +713,13 @@ void aio_context_setup(AioContext *ctx)
#endif
}
+void aio_context_destroy(AioContext *ctx)
+{
+#ifdef CONFIG_EPOLL_CREATE1
+ aio_epoll_disable(ctx);
+#endif
+}
+
void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
int64_t grow, int64_t shrink, Error **errp)
{