From 384b1c330ffbee4318ee75c97186450f0f6e9e35 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 31 Jul 2021 18:18:48 +0200 Subject: term: asynchronous client application termination MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the foot window is closed, and we need to terminate the client application, do this in an asynchronous fashion: * Don’t do a blocking call to waitpid(), instead, rely on the reaper callback * Use a timer FD to implement the timeout before sending SIGKILL (instead of using SIGALRM). * Send SIGTERM immediately (we used to *just* close the PTY, and then wait 2 seconds before sending SIGTERM). * Raise the timeout from 2 seconds to 60 Full shutdown now depends on *two* asynchronous tasks - unmapping the window, and waiting for the client application to terminate. Only when *both* of these have completed do we proceed and call term_destroy(), and the user provided shutdown callback. --- render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'render.c') diff --git a/render.c b/render.c index 84796aa0..3fbbb579 100644 --- a/render.c +++ b/render.c @@ -3640,7 +3640,7 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data) tll_foreach(renderer->wayl->terms, it) { struct terminal *term = it->item; - if (unlikely(!term->window->is_configured)) + if (unlikely(term->is_shutting_down || !term->window->is_configured)) continue; bool grid = term->render.refresh.grid; -- cgit v1.3