From: Willy Tarreau <w@1wt.eu>
Date: Wed, 4 Mar 2020 09:53:07 +0000 (+0100)
Subject: MINOR: wdt: do not depend on USE_THREAD
X-Git-Tag: v2.2-dev4~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e58114e0e5e1ef1f67194bde0b0b8d159bd3ac48;p=thirdparty%2Fhaproxy.git

MINOR: wdt: do not depend on USE_THREAD

There is no reason for restricting the use of the watchdog to threads
anymore, as it works perfectly without threads as well.
---

diff --git a/src/wdt.c b/src/wdt.c
index 4adc33db28..528685acb5 100644
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -25,7 +25,7 @@
  * It relies on timer_create() and timer_settime() which are only available in
  * this case.
  */
-#if defined(USE_THREAD) && defined(USE_RT) && (_POSIX_TIMERS > 0) && defined(_POSIX_THREAD_CPUTIME)
+#if defined(USE_RT) && (_POSIX_TIMERS > 0) && defined(_POSIX_THREAD_CPUTIME)
 
 /* We'll deliver SIGALRM when we've run out of CPU as it's not intercepted by
  * gdb by default.
@@ -117,9 +117,11 @@ void wdt_handler(int sig, siginfo_t *si, void *arg)
 	 * with the other thread interrupted exactly where it was running and
 	 * the current one not involved in this.
 	 */
+#ifdef USE_THREAD
 	if (thr != tid)
 		pthread_kill(ha_thread_info[thr].pthread, sig);
 	else
+#endif
 		ha_panic();
 	return;