Change VG_(scheduler)() slightly to remove two more global vars from
vg_include.h.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2578 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 183352b..960aac5 100644
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -930,9 +930,9 @@
VgSchedReturnCode;
-/* The scheduler. */
-extern VgSchedReturnCode VG_(scheduler) ( Int* exit_code,
- ThreadId* last_run_thread );
+// The scheduler. 'fatal_sigNo' is only set if VgSrc_FatalSig is returned.
+extern VgSchedReturnCode VG_(scheduler)
+ ( Int* exit_code, ThreadId* last_run_thread, Int* fatal_sigNo );
extern void VG_(scheduler_init) ( void );
@@ -941,6 +941,9 @@
// Longjmp back to the scheduler and thus enter the sighandler immediately.
extern void VG_(resume_scheduler) ( Int sigNo, vki_ksiginfo_t *info );
+// Longjmp, ending the scheduler, when a fatal signal occurs in the client.
+extern void VG_(scheduler_handle_fatal_signal)( Int sigNo );
+
/* The red-zone size which we put at the bottom (highest address) of
thread stacks, for paranoia reasons. This can be arbitrary, and
doesn't really need to be set at compile time. */
@@ -1285,10 +1288,6 @@
/* Counts downwards in vg_run_innerloop. */
extern UInt VG_(dispatch_ctr);
-/* If we're doing the default action of a fatal signal */
-extern jmp_buf* VG_(fatal_signal_jmpbuf_ptr);
-extern Int VG_(fatal_sigNo); /* the fatal signal */
-
/* --- Counters, for informational purposes only. --- */
// These counters must be declared here because they're maintained by