[Xen-changelog] [xen master] libxl: events: Tear down SIGCHLD machinery on ctx destruction

[patchbot@xxxxxxx]

commit 5a9682574538e7cc1b59c17af19ced628ccfe594
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Thu Nov 27 18:04:29 2014 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Dec 10 13:48:31 2014 +0000

    libxl: events: Tear down SIGCHLD machinery on ctx destruction
    
    We want to have no fd events registered when we are idle.
    Also, we should put back the default SIGCHLD handler.  So:
    
     * In libxl_ctx_free, use libxl_childproc_setmode to set the mode to
       the default, which is libxl_sigchld_owner_libxl (ie `libxl owns
       SIGCHLD only when it has active children').
    
       But of course there are no active children at libxl teardown so
       this results in libxl__sigchld_notneeded: the ctx loses its
       interest in SIGCHLD (unsetting the SIGCHLD handler if we were the
       last ctx) and deregisters the per-ctx selfpipe fd.
    
     * assert that this is the case: ie that we are no longer interested
       in the selfpipe.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Tested-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 tools/libxl/libxl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index a238621..8f06043 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -162,11 +162,12 @@ int libxl_ctx_free(libxl_ctx *ctx)
     while ((eject = LIBXL_LIST_FIRST(&CTX->disk_eject_evgens)))
         libxl__evdisable_disk_eject(gc, eject);
 
+    libxl_childproc_setmode(CTX,0,0);
     for (i = 0; i < ctx->watch_nslots; i++)
         assert(!libxl__watch_slot_contents(gc, i));
     assert(!libxl__ev_fd_isregistered(&ctx->watch_efd));
     libxl__ev_fd_deregister(gc, &ctx->evtchn_efd);
-    libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd);
+    assert(!libxl__ev_fd_isregistered(&ctx->sigchld_selfpipe_efd));
 
     /* Now there should be no more events requested from the application: */
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog