|
From: Mark W. <ma...@so...> - 2022-04-08 07:52:22
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=a1bb40171ab2289043856c6893522449ccc9fdff commit a1bb40171ab2289043856c6893522449ccc9fdff Author: Mark Wielaard <ma...@kl...> Date: Fri Apr 8 09:42:10 2022 +0200 Move ht_sigchld_ignore and ht_ignore_node to pub_tool_signals.h ht_sigchld_ignore and ht_ignore_node were defined in pub_core_signals.h which cannot include any other tool header. ...checking header files and include directives *** File coregrind/pub_core_signals.h must not include pub_tool_hashtable.h So move the definition and type to pub_tool_signals.h Diff: --- coregrind/pub_core_signals.h | 10 ---------- include/pub_tool_signals.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coregrind/pub_core_signals.h b/coregrind/pub_core_signals.h index 1c86ee5f63..ae8555ba80 100644 --- a/coregrind/pub_core_signals.h +++ b/coregrind/pub_core_signals.h @@ -35,7 +35,6 @@ #include "pub_tool_signals.h" // I want to get rid of this header... #include "pub_core_vki.h" // vki_sigset_t et al. -#include "pub_tool_hashtable.h" /* Highest signal the kernel will let us use */ extern Int VG_(max_signal); @@ -86,15 +85,6 @@ extern Bool VG_(extend_stack)(ThreadId tid, Addr addr); before using that signal to kill the process. */ extern void VG_(set_default_handler)(Int sig); -/* Hash table of PIDs from which SIGCHLD is ignored. */ -extern VgHashTable *ht_sigchld_ignore; - -/* Hash table node where each key represents a PID. */ -typedef struct _ht_ignore_node { - struct _ht_ignore_node *next; - UWord key; -} ht_ignore_node; - #endif // __PUB_CORE_SIGNALS_H /*--------------------------------------------------------------------*/ diff --git a/include/pub_tool_signals.h b/include/pub_tool_signals.h index 0de30465c1..f037cd5d7e 100644 --- a/include/pub_tool_signals.h +++ b/include/pub_tool_signals.h @@ -30,6 +30,7 @@ #define __PUB_TOOL_SIGNALS_H #include "pub_tool_basics.h" // Addr +#include "pub_tool_hashtable.h" // VgHashTable // Register an interest in apparently internal faults; used code which // wanders around dangerous memory (ie, leakcheck). The catcher is @@ -43,6 +44,15 @@ typedef void (*fault_catcher_t)(Int sig, Addr addr); extern fault_catcher_t VG_(set_fault_catcher)(fault_catcher_t catcher); +/* Hash table of PIDs from which SIGCHLD is ignored. */ +extern VgHashTable *ht_sigchld_ignore; + +/* Hash table node where each key represents a PID. */ +typedef struct _ht_ignore_node { + struct _ht_ignore_node *next; + UWord key; +} ht_ignore_node; + #endif // __PUB_TOOL_SIGNALS_H /*--------------------------------------------------------------------*/ |