|
From: <sv...@va...> - 2006-04-19 19:31:54
|
Author: sewardj
Date: 2006-04-19 20:31:46 +0100 (Wed, 19 Apr 2006)
New Revision: 5859
Log:
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.
Modified:
trunk/coregrind/pub_core_libcsignal.h
trunk/include/pub_tool_libcsignal.h
Modified: trunk/coregrind/pub_core_libcsignal.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/pub_core_libcsignal.h 2006-04-19 09:30:33 UTC (rev 58=
58)
+++ trunk/coregrind/pub_core_libcsignal.h 2006-04-19 19:31:46 UTC (rev 58=
59)
@@ -37,6 +37,43 @@
=20
#include "pub_tool_libcsignal.h"
=20
+/* 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* s=
rc );
+extern void VG_(sigdelset_from_set) ( vki_sigset_t* dst, vki_sigset_t* s=
rc );
+
+/* --- 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 *,=20
+ 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
=20
/*--------------------------------------------------------------------*/
Modified: trunk/include/pub_tool_libcsignal.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/include/pub_tool_libcsignal.h 2006-04-19 09:30:33 UTC (rev 5858=
)
+++ trunk/include/pub_tool_libcsignal.h 2006-04-19 19:31:46 UTC (rev 5859=
)
@@ -36,37 +36,10 @@
defines. Since we're operating right at the kernel interface, glibc'=
s view
of the world is entirely irrelevant. */
=20
-/* --- 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* s=
rc );
-extern void VG_(sigdelset_from_set) ( vki_sigset_t* dst, vki_sigset_t* s=
rc );
-
/* --- 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 );
=20
-extern Int VG_(sigtimedwait)( const vki_sigset_t *, vki_siginfo_t *,=20
- 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
=20
/*--------------------------------------------------------------------*/
|