konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: wdt: do not depend on USE_THREAD

Browse Source 
There is no reason for restricting the use of the watchdog to threads
anymore, as it works perfectly without threads as well.
This commit is contained in:
Willy Tarreau 2020-03-04 10:53:07 +01:00
parent d6f1966543
commit e58114e0e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wdt.c
View File

@ -25,7 +25,7 @@
* It relies on timer_create() and timer_settime() which are only available in * It relies on timer_create() and timer_settime() which are only available in
* this case. * 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 /* We'll deliver SIGALRM when we've run out of CPU as it's not intercepted by
* gdb by default. * 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 * with the other thread interrupted exactly where it was running and
* the current one not involved in this. * the current one not involved in this.
*/ */
#ifdef USE_THREAD
if (thr != tid) if (thr != tid)
pthread_kill(ha_thread_info[thr].pthread, sig); pthread_kill(ha_thread_info[thr].pthread, sig);
else else
#endif
ha_panic(); ha_panic();
return; return;