mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
libxl: event: Rename ctx.pollers_fd_changed to .pollers_active
We are going to use this a bit more widely. Make the name more general. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Reviewed-by: George Dunlap <george.dunlap@citrix.com> Tested-by: George Dunlap <george.dunlap@citrix.com>
This commit is contained in:
1 parent
f2e3c5b66b
commit
2d5fa855a1
3 files changed
+9
-9
No files matched your search
+2
-2
@@ -48,7 +48,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version,
|
||||
ctx->poller_app = 0;
|
||||
LIBXL_LIST_INIT(&ctx->pollers_event);
|
||||
LIBXL_LIST_INIT(&ctx->pollers_idle);
|
||||
LIBXL_LIST_INIT(&ctx->pollers_fds_changed);
|
||||
LIBXL_LIST_INIT(&ctx->pollers_active);
|
||||
|
||||
LIBXL_LIST_INIT(&ctx->efds);
|
||||
LIBXL_TAILQ_INIT(&ctx->etimes);
|
||||
@@ -177,7 +177,7 @@ int libxl_ctx_free(libxl_ctx *ctx)
|
||||
libxl__poller_put(ctx, ctx->poller_app);
|
||||
ctx->poller_app = NULL;
|
||||
assert(LIBXL_LIST_EMPTY(&ctx->pollers_event));
|
||||
assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed));
|
||||
assert(LIBXL_LIST_EMPTY(&ctx->pollers_active));
|
||||
libxl__poller *poller, *poller_tmp;
|
||||
LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) {
|
||||
libxl__poller_dispose(poller);
|
||||
|
||||
@@ -238,7 +238,7 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev)
|
||||
LIBXL_LIST_REMOVE(ev, entry);
|
||||
ev->fd = -1;
|
||||
|
||||
LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry)
|
||||
LIBXL_LIST_FOREACH(poller, &CTX->pollers_active, active_entry)
|
||||
poller->fds_deregistered = 1;
|
||||
|
||||
out:
|
||||
@@ -1663,15 +1663,15 @@ libxl__poller *libxl__poller_get(libxl__gc *gc)
|
||||
}
|
||||
}
|
||||
|
||||
LIBXL_LIST_INSERT_HEAD(&CTX->pollers_fds_changed, p,
|
||||
fds_changed_entry);
|
||||
LIBXL_LIST_INSERT_HEAD(&CTX->pollers_active, p,
|
||||
active_entry);
|
||||
return p;
|
||||
}
|
||||
|
||||
void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p)
|
||||
{
|
||||
if (!p) return;
|
||||
LIBXL_LIST_REMOVE(p, fds_changed_entry);
|
||||
LIBXL_LIST_REMOVE(p, active_entry);
|
||||
LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry);
|
||||
}
|
||||
|
||||
|
||||
@@ -629,13 +629,13 @@ struct libxl__poller {
|
||||
/*
|
||||
* We also use the poller to record whether any fds have been
|
||||
* deregistered since we entered poll. Each poller which is not
|
||||
* idle is on the list pollers_fds_changed. fds_deregistered is
|
||||
* idle is on the list pollers_active. fds_deregistered is
|
||||
* cleared by beforepoll, and tested by afterpoll. Whenever an fd
|
||||
* event is deregistered, we set the fds_deregistered of all non-idle
|
||||
* pollers. So afterpoll can tell whether any POLLNVAL is
|
||||
* plausibly due to an fd being closed and reopened.
|
||||
*/
|
||||
LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry;
|
||||
LIBXL_LIST_ENTRY(libxl__poller) active_entry;
|
||||
bool fds_deregistered;
|
||||
};
|
||||
|
||||
@@ -678,7 +678,7 @@ struct libxl__ctx {
|
||||
|
||||
libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */
|
||||
LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle;
|
||||
LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed;
|
||||
LIBXL_LIST_HEAD(, libxl__poller) pollers_active;
|
||||
|
||||
LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus)
|
||||
hook_fd_nexi_idle, hook_timeout_nexi_idle;
|
||||
|
||||