From bf0e9ed9c77ea1a9322d239dfae2d599da0e2ef8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 10 Feb 2015 19:16:08 +0000 Subject: [PATCH] libxl: ao abort: Provide explicit internal abort check API Some places in libxl which can't handle abort via a libxl__ao_abortable callback might nevertheless benefit from being able to explicitly check whether abort has been requested. Provide the (fairly trivial) internal API function to do this. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_event.c | 11 +++++++++++ tools/libxl/libxl_internal.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index f9daa55d32..50155636f2 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -2033,6 +2033,17 @@ int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) return rc; } +int libxl__ao_aborting(libxl__ao *ao) +{ + libxl__ao *root = ao_nested_root(ao); + if (root->aborting) { + DBG("ao=%p: aborting at explicit check (root=%p)", ao, root); + return ERROR_ABORTED; + } + + return 0; +} + int libxl__ao_abortable_register(libxl__ao_abortable *abrt) { libxl__ao *ao = abrt->ao; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 411f7ad732..4150071d5c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -226,6 +226,8 @@ static inline void libxl__ao_abortable_init static inline bool libxl__ao_abortable_isregistered (const libxl__ao_abortable *c) { return c->registered; } +int libxl__ao_aborting(libxl__ao *ao); /* -> 0 or ERROR_ABORTED */ + typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, -- 2.39.5