Almost all the stuff in pub_tool_libcsignal.h was not used by any tool;

so has been moved back into pub_core_libcsignal.h.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5859

diff --git a/coregrind/pub_core_libcsignal.h b/coregrind/pub_core_libcsignal.h
index 5b6ef0e9926cb236152c3e6131823ce8527e4a14..c897593af27ebb046b3209dafab13ce7a9f7a383 100644 (file)
--- a/coregrind/pub_core_libcsignal.h
+++ b/coregrind/pub_core_libcsignal.h
@@ -37,6 +37,43 @@
 
 #include "pub_tool_libcsignal.h"
 
+/* Note that these use the vki_ (kernel) structure
+   definitions, which are different in places from those that glibc
+   defines.  Since we're operating right at the kernel interface, glibc's view
+   of the world is entirely irrelevant. */
+
+/* --- Signal set ops --- */
+extern Int  VG_(sigfillset)  ( vki_sigset_t* set );
+extern Int  VG_(sigemptyset) ( vki_sigset_t* set );
+
+extern Bool VG_(isfullsigset)  ( const vki_sigset_t* set );
+extern Bool VG_(isemptysigset) ( const vki_sigset_t* set );
+extern Bool VG_(iseqsigset)    ( const vki_sigset_t* set1,
+                                 const vki_sigset_t* set2 );
+
+extern Int  VG_(sigaddset)   ( vki_sigset_t* set, Int signum );
+extern Int  VG_(sigdelset)   ( vki_sigset_t* set, Int signum );
+extern Int  VG_(sigismember) ( const vki_sigset_t* set, Int signum );
+
+extern void VG_(sigaddset_from_set) ( vki_sigset_t* dst, vki_sigset_t* src );
+extern void VG_(sigdelset_from_set) ( vki_sigset_t* dst, vki_sigset_t* src );
+
+/* --- Mess with the kernel's sig state --- */
+/* VG_(sigprocmask) is in pub_tool_libcsignal.h. */
+
+extern Int VG_(sigaction)   ( Int signum,
+                              const struct vki_sigaction* act,
+                              struct vki_sigaction* oldact );
+
+extern Int VG_(sigtimedwait)( const vki_sigset_t *, vki_siginfo_t *, 
+                             const struct vki_timespec * );
+
+extern Int VG_(signal)      ( Int signum, void (*sighandler)(Int) );
+
+extern Int VG_(kill)        ( Int pid, Int signo );
+extern Int VG_(tkill)       ( ThreadId tid, Int signo );
+
+
 #endif   // __PUB_CORE_LIBCSIGNAL_H
 
 /*--------------------------------------------------------------------*/

diff --git a/include/pub_tool_libcsignal.h b/include/pub_tool_libcsignal.h
index 1a222d9d5e81e8e2facef69814ecc4a75b4b0b60..b9f3d030e54250ee00edfeebc0120e0023b6a411 100644 (file)
--- a/include/pub_tool_libcsignal.h
+++ b/include/pub_tool_libcsignal.h
@@ -36,36 +36,9 @@
    defines.  Since we're operating right at the kernel interface, glibc's view
    of the world is entirely irrelevant. */
 
-/* --- Signal set ops --- */
-extern Int  VG_(sigfillset)  ( vki_sigset_t* set );
-extern Int  VG_(sigemptyset) ( vki_sigset_t* set );
-
-extern Bool VG_(isfullsigset)  ( const vki_sigset_t* set );
-extern Bool VG_(isemptysigset) ( const vki_sigset_t* set );
-extern Bool VG_(iseqsigset)    ( const vki_sigset_t* set1,
-                                 const vki_sigset_t* set2 );
-
-extern Int  VG_(sigaddset)   ( vki_sigset_t* set, Int signum );
-extern Int  VG_(sigdelset)   ( vki_sigset_t* set, Int signum );
-extern Int  VG_(sigismember) ( const vki_sigset_t* set, Int signum );
-
-extern void VG_(sigaddset_from_set) ( vki_sigset_t* dst, vki_sigset_t* src );
-extern void VG_(sigdelset_from_set) ( vki_sigset_t* dst, vki_sigset_t* src );
-
 /* --- Mess with the kernel's sig state --- */
 extern Int VG_(sigprocmask) ( Int how, const vki_sigset_t* set,
                               vki_sigset_t* oldset );
-extern Int VG_(sigaction)   ( Int signum,
-                              const struct vki_sigaction* act,
-                              struct vki_sigaction* oldact );
-
-extern Int VG_(sigtimedwait)( const vki_sigset_t *, vki_siginfo_t *, 
-                             const struct vki_timespec * );
-
-extern Int VG_(signal)      ( Int signum, void (*sighandler)(Int) );
-
-extern Int VG_(kill)        ( Int pid, Int signo );
-extern Int VG_(tkill)       ( ThreadId tid, Int signo );
 
 #endif   // __PUB_TOOL_LIBCBSIGNAL_H