mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-30 06:22:00 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: wdt: Move the definitions of WDTSIG and DEBUGSIG into types/signal.h.

Browse Source 
Move the definition of WDTSIG and DEBUGSIG from wdt.c and debug.c into
types/signal.h, so that we can access them in another file.
We need those definition to avoid blocking those signals when running
__signal_process_queue().

This should be backported to 2.1, 2.0 and 1.9.
This commit is contained in:
Olivier Houchard 2020-03-18 13:07:19 +01:00
parent 1fae8db7b7
commit de01ea9878
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/types/signal.h
View File

@ -25,6 +25,26 @@
#define SIG_F_TYPE_FCT 0x0002 /* handler is a function + arg */
#define SIG_F_TYPE_TASK 0x0004 /* handler is a task + reason */
/* Define WDTSIG if available */
#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.
*/
#define WDTSIG SIGALRM
#endif
#ifdef USE_THREAD_DUMP
/* The signal to trigger a debug dump on a thread is SIGURG. It has the benefit
* of not stopping gdb by default, so that issuing "show threads" in a process
* being debugged has no adverse effect.
*/
#define DEBUGSIG SIGURG
#endif
/* those are highly dynamic and stored in pools */
struct sig_handler {
struct list list;

7
src/debug.c
View File

@ -29,6 +29,7 @@
#include <common/standard.h>
#include <types/global.h>
#include <types/signal.h>
#include <proto/cli.h>
#include <proto/fd.h>
@ -687,12 +688,6 @@ void ha_thread_dump_all_to_trash()
#else /* below USE_THREAD_DUMP is set */
/* The signal to trigger a debug dump on a thread is SIGURG. It has the benefit
* of not stopping gdb by default, so that issuing "show threads" in a process
* being debugged has no adverse effect.
*/
#define DEBUGSIG SIGURG
/* ID of the thread requesting the dump */
static unsigned int thread_dump_tid;

6
src/wdt.c
View File

@ -18,6 +18,7 @@
#include <common/initcall.h>
#include <common/standard.h>
#include <types/global.h>
#include <types/signal.h>
#include <proto/log.h>
@ -27,11 +28,6 @@
*/
#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.
*/
#define WDTSIG SIGALRM
/* Setup (or ping) the watchdog timer for thread <thr>. Returns non-zero on
* success, zero on failure. It interrupts once per second of CPU time. It
* happens that timers based on the CPU time are not automatically re-armed