Browse Source
All callers now pass is_external=false to aio_set_fd_handler() and aio_set_event_notifier(). The aio_disable_external() API that temporarily disables fd handlers that were registered is_external=true is therefore dead code. Remove aio_disable_external(), aio_enable_external(), and the is_external arguments to aio_set_fd_handler() and aio_set_event_notifier(). The entire test-fdmon-epoll test is removed because its sole purpose was testing aio_disable_external(). Parts of this patch were generated using the following coccinelle (https://coccinelle.lip6.fr/) semantic patch: @@ expression ctx, fd, is_external, io_read, io_write, io_poll, io_poll_ready, opaque; @@ - aio_set_fd_handler(ctx, fd, is_external, io_read, io_write, io_poll, io_poll_ready, opaque) + aio_set_fd_handler(ctx, fd, io_read, io_write, io_poll, io_poll_ready, opaque) @@ expression ctx, notifier, is_external, io_read, io_poll, io_poll_ready; @@ - aio_set_event_notifier(ctx, notifier, is_external, io_read, io_poll, io_poll_ready) + aio_set_event_notifier(ctx, notifier, io_read, io_poll, io_poll_ready) Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20230516190238.8401-21-stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>pull/241/head
Stefan Hajnoczi
3 years ago
committed by
Kevin Wolf
Kevin Wolf
36 changed files with 80 additions and 298 deletions
@ -1,73 +0,0 @@ |
|||
/* SPDX-License-Identifier: GPL-2.0-or-later */ |
|||
/*
|
|||
* fdmon-epoll tests |
|||
* |
|||
* Copyright (c) 2020 Red Hat, Inc. |
|||
*/ |
|||
|
|||
#include "qemu/osdep.h" |
|||
#include "block/aio.h" |
|||
#include "qapi/error.h" |
|||
#include "qemu/main-loop.h" |
|||
|
|||
static AioContext *ctx; |
|||
|
|||
static void dummy_fd_handler(EventNotifier *notifier) |
|||
{ |
|||
event_notifier_test_and_clear(notifier); |
|||
} |
|||
|
|||
static void add_event_notifiers(EventNotifier *notifiers, size_t n) |
|||
{ |
|||
for (size_t i = 0; i < n; i++) { |
|||
event_notifier_init(¬ifiers[i], false); |
|||
aio_set_event_notifier(ctx, ¬ifiers[i], false, |
|||
dummy_fd_handler, NULL, NULL); |
|||
} |
|||
} |
|||
|
|||
static void remove_event_notifiers(EventNotifier *notifiers, size_t n) |
|||
{ |
|||
for (size_t i = 0; i < n; i++) { |
|||
aio_set_event_notifier(ctx, ¬ifiers[i], false, NULL, NULL, NULL); |
|||
event_notifier_cleanup(¬ifiers[i]); |
|||
} |
|||
} |
|||
|
|||
/* Check that fd handlers work when external clients are disabled */ |
|||
static void test_external_disabled(void) |
|||
{ |
|||
EventNotifier notifiers[100]; |
|||
|
|||
/* fdmon-epoll is only enabled when many fd handlers are registered */ |
|||
add_event_notifiers(notifiers, G_N_ELEMENTS(notifiers)); |
|||
|
|||
event_notifier_set(¬ifiers[0]); |
|||
assert(aio_poll(ctx, true)); |
|||
|
|||
aio_disable_external(ctx); |
|||
event_notifier_set(¬ifiers[0]); |
|||
assert(aio_poll(ctx, true)); |
|||
aio_enable_external(ctx); |
|||
|
|||
remove_event_notifiers(notifiers, G_N_ELEMENTS(notifiers)); |
|||
} |
|||
|
|||
int main(int argc, char **argv) |
|||
{ |
|||
/*
|
|||
* This code relies on the fact that fdmon-io_uring disables itself when |
|||
* the glib main loop is in use. The main loop uses fdmon-poll and upgrades |
|||
* to fdmon-epoll when the number of fds exceeds a threshold. |
|||
*/ |
|||
qemu_init_main_loop(&error_fatal); |
|||
ctx = qemu_get_aio_context(); |
|||
|
|||
while (g_main_context_iteration(NULL, false)) { |
|||
/* Do nothing */ |
|||
} |
|||
|
|||
g_test_init(&argc, &argv, NULL); |
|||
g_test_add_func("/fdmon-epoll/external-disabled", test_external_disabled); |
|||
return g_test_run(); |
|||
} |
|||
Loading…
Reference in new issue