[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 16/17] aio: clean up now-unused functions
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [PATCH 16/17] aio: clean up now-unused functions |
Date: |
Tue, 25 Sep 2012 17:11:38 -0500 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
Paolo Bonzini <address@hidden> writes:
> Some cleanups can now be made, now that the main loop does not anymore need
> hooks into the bottom half code.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Regards,
Anthony Liguori
> ---
> async.c | 23 +++++++----------------
> oslib-posix.c | 31 -------------------------------
> qemu-aio.h | 1 -
> qemu-common.h | 1 -
> 4 file modificati, 7 inserzioni(+), 49 rimozioni(-)
>
> diff --git a/async.c b/async.c
> index 31c6c76..5a96d11 100644
> --- a/async.c
> +++ b/async.c
> @@ -117,16 +117,20 @@ void qemu_bh_delete(QEMUBH *bh)
> bh->deleted = 1;
> }
>
> -void aio_bh_update_timeout(AioContext *ctx, uint32_t *timeout)
> +static gboolean
> +aio_ctx_prepare(GSource *source, gint *timeout)
> {
> + AioContext *ctx = (AioContext *) source;
> QEMUBH *bh;
> + bool scheduled = false;
>
> for (bh = ctx->first_bh; bh; bh = bh->next) {
> if (!bh->deleted && bh->scheduled) {
> + scheduled = true;
> if (bh->idle) {
> /* idle bottom halves will be polled at least
> * every 10ms */
> - *timeout = MIN(10, *timeout);
> + *timeout = 10;
> } else {
> /* non-idle bottom halves will be executed
> * immediately */
> @@ -135,21 +139,8 @@ void aio_bh_update_timeout(AioContext *ctx, uint32_t
> *timeout)
> }
> }
> }
> -}
> -
> -static gboolean
> -aio_ctx_prepare(GSource *source, gint *timeout)
> -{
> - AioContext *ctx = (AioContext *) source;
> - uint32_t wait = -1;
> - aio_bh_update_timeout(ctx, &wait);
> -
> - if (wait != -1) {
> - *timeout = MIN(*timeout, wait);
> - return wait == 0;
> - }
>
> - return FALSE;
> + return scheduled;
> }
>
> static gboolean
> diff --git a/oslib-posix.c b/oslib-posix.c
> index dbeb627..9db9c3d 100644
> --- a/oslib-posix.c
> +++ b/oslib-posix.c
> @@ -61,9 +61,6 @@ static int running_on_valgrind = -1;
> #ifdef CONFIG_LINUX
> #include <sys/syscall.h>
> #endif
> -#ifdef CONFIG_EVENTFD
> -#include <sys/eventfd.h>
> -#endif
>
> int qemu_get_thread_id(void)
> {
> @@ -183,34 +180,6 @@ int qemu_pipe(int pipefd[2])
> return ret;
> }
>
> -/*
> - * Creates an eventfd that looks like a pipe and has EFD_CLOEXEC set.
> - */
> -int qemu_eventfd(int fds[2])
> -{
> -#ifdef CONFIG_EVENTFD
> - int ret;
> -
> - ret = eventfd(0, 0);
> - if (ret >= 0) {
> - fds[0] = ret;
> - fds[1] = dup(ret);
> - if (fds[1] == -1) {
> - close(ret);
> - return -1;
> - }
> - qemu_set_cloexec(ret);
> - qemu_set_cloexec(fds[1]);
> - return 0;
> - }
> - if (errno != ENOSYS) {
> - return -1;
> - }
> -#endif
> -
> - return qemu_pipe(fds);
> -}
> -
> int qemu_utimens(const char *path, const struct timespec *times)
> {
> struct timeval tv[2], tv_now;
> diff --git a/qemu-aio.h b/qemu-aio.h
> index 2354617..1b7eb6e 100644
> --- a/qemu-aio.h
> +++ b/qemu-aio.h
> @@ -125,7 +125,6 @@ void aio_notify(AioContext *ctx);
> * These are internal functions used by the QEMU main loop.
> */
> int aio_bh_poll(AioContext *ctx);
> -void aio_bh_update_timeout(AioContext *ctx, uint32_t *timeout);
>
> /**
> * qemu_bh_schedule: Schedule a bottom half.
> diff --git a/qemu-common.h b/qemu-common.h
> index ac44657..1ea6ea3 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -219,7 +219,6 @@ ssize_t qemu_recv_full(int fd, void *buf, size_t count,
> int flags)
> QEMU_WARN_UNUSED_RESULT;
>
> #ifndef _WIN32
> -int qemu_eventfd(int pipefd[2]);
> int qemu_pipe(int pipefd[2]);
> #endif
>
> --
> 1.7.12
- Re: [Qemu-devel] [PATCH 09/17] aio: prepare for introducing GSource-based dispatch, (continued)
- [Qemu-devel] [PATCH 12/17] aio: add aio_notify, Paolo Bonzini, 2012/09/25
- [Qemu-devel] [PATCH 13/17] aio: call aio_notify after setting I/O handlers, Paolo Bonzini, 2012/09/25
- [Qemu-devel] [PATCH 14/17] main-loop: use GSource to poll AIO file descriptors, Paolo Bonzini, 2012/09/25
- [Qemu-devel] [PATCH 16/17] aio: clean up now-unused functions, Paolo Bonzini, 2012/09/25
- Re: [Qemu-devel] [PATCH 16/17] aio: clean up now-unused functions,
Anthony Liguori <=
- [Qemu-devel] [PATCH 15/17] main-loop: use aio_notify for qemu_notify_event, Paolo Bonzini, 2012/09/25
- [Qemu-devel] [PATCH 17/17] linux-aio: use event notifiers, Paolo Bonzini, 2012/09/25
- [Qemu-devel] [PATCH 11/17] aio: make AioContexts GSources, Paolo Bonzini, 2012/09/25
- Re: [Qemu-devel] [RFC PATCH 00/17] Support for multiple "AIO contexts", Kevin Wolf, 2012/09/26