From 8b0c9cf155eb3505a643a3e769248a09fdf637f5 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 10 Nov 2015 09:42:46 +0100 Subject: watcher: Check for cancellation if poll() fails with EINTR With LinuxThreads, poll() is unfortunately no cancellation point. It seems that poll gets woken up after cancellation, but we actively must check for cancellation before re-entering poll to properly shut down the watcher thread. --- src/libstrongswan/processing/watcher.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/libstrongswan') diff --git a/src/libstrongswan/processing/watcher.c b/src/libstrongswan/processing/watcher.c index 5b94208bf..b7628501a 100644 --- a/src/libstrongswan/processing/watcher.c +++ b/src/libstrongswan/processing/watcher.c @@ -345,6 +345,13 @@ static job_requeue_t watch(private_watcher_t *this) old = thread_cancelability(TRUE); res = poll(pfd, count, -1); + if (res == -1 && errno == EINTR) + { + /* LinuxThreads interrupts poll(), but does not make it a + * cancellation point. Manually test if we got cancelled. */ + thread_cancellation_point(); + } + thread_cancelability(old); thread_cleanup_pop(FALSE); -- cgit v1.2.3