|
Mark Wielaard |
44fb31 |
commit 2b49317b4f237ea5f648d8b958f96cd03fcabc7d
|
|
Mark Wielaard |
44fb31 |
Author: philippe <philippe@a5019735-40e9-0310-863c-91ae7b9d1cf9>
|
|
Mark Wielaard |
44fb31 |
Date: Mon Nov 28 19:34:06 2016 +0000
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
Fix 373046 - Stacks registered by core are never deregistered
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16159 a5019735-40e9-0310-863c-91ae7b9d1cf9
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
|
|
Mark Wielaard |
44fb31 |
index 0363898..49f51d6 100644
|
|
Mark Wielaard |
44fb31 |
--- a/coregrind/m_scheduler/scheduler.c
|
|
Mark Wielaard |
44fb31 |
+++ b/coregrind/m_scheduler/scheduler.c
|
|
Mark Wielaard |
44fb31 |
@@ -488,6 +488,7 @@ static void os_state_clear(ThreadState *tst)
|
|
Mark Wielaard |
44fb31 |
{
|
|
Mark Wielaard |
44fb31 |
tst->os_state.lwpid = 0;
|
|
Mark Wielaard |
44fb31 |
tst->os_state.threadgroup = 0;
|
|
Mark Wielaard |
44fb31 |
+ tst->os_state.stk_id = NULL_STK_ID;
|
|
Mark Wielaard |
44fb31 |
# if defined(VGO_linux)
|
|
Mark Wielaard |
44fb31 |
/* no other fields to clear */
|
|
Mark Wielaard |
44fb31 |
# elif defined(VGO_darwin)
|
|
Mark Wielaard |
44fb31 |
@@ -504,7 +505,6 @@ static void os_state_clear(ThreadState *tst)
|
|
Mark Wielaard |
44fb31 |
# if defined(VGP_x86_solaris)
|
|
Mark Wielaard |
44fb31 |
tst->os_state.thrptr = 0;
|
|
Mark Wielaard |
44fb31 |
# endif
|
|
Mark Wielaard |
44fb31 |
- tst->os_state.stk_id = (UWord)-1;
|
|
Mark Wielaard |
44fb31 |
tst->os_state.ustack = NULL;
|
|
Mark Wielaard |
44fb31 |
tst->os_state.in_door_return = False;
|
|
Mark Wielaard |
44fb31 |
tst->os_state.door_return_procedure = 0;
|
|
Mark Wielaard |
44fb31 |
diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
|
|
Mark Wielaard |
44fb31 |
index 6ef6a90..28972ae 100644
|
|
Mark Wielaard |
44fb31 |
--- a/coregrind/m_syswrap/syswrap-generic.c
|
|
Mark Wielaard |
44fb31 |
+++ b/coregrind/m_syswrap/syswrap-generic.c
|
|
Mark Wielaard |
44fb31 |
@@ -84,11 +84,14 @@ void ML_(guess_and_register_stack) (Addr sp, ThreadState* tst)
|
|
Mark Wielaard |
44fb31 |
tst->client_stack_highest_byte = (Addr)VG_PGROUNDUP(sp)-1;
|
|
Mark Wielaard |
44fb31 |
tst->client_stack_szB = tst->client_stack_highest_byte - seg->start + 1;
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
- VG_(register_stack)(seg->start, tst->client_stack_highest_byte);
|
|
Mark Wielaard |
44fb31 |
+ tst->os_state.stk_id
|
|
Mark Wielaard |
44fb31 |
+ = VG_(register_stack)(seg->start, tst->client_stack_highest_byte);
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
if (debug)
|
|
Mark Wielaard |
44fb31 |
- VG_(printf)("tid %u: guessed client stack range [%#lx-%#lx]\n",
|
|
Mark Wielaard |
44fb31 |
- tst->tid, seg->start, tst->client_stack_highest_byte);
|
|
Mark Wielaard |
44fb31 |
+ VG_(printf)("tid %u: guessed client stack range [%#lx-%#lx]"
|
|
Mark Wielaard |
44fb31 |
+ " as stk_id %lu\n",
|
|
Mark Wielaard |
44fb31 |
+ tst->tid, seg->start, tst->client_stack_highest_byte,
|
|
Mark Wielaard |
44fb31 |
+ tst->os_state.stk_id);
|
|
Mark Wielaard |
44fb31 |
} else {
|
|
Mark Wielaard |
44fb31 |
VG_(message)(Vg_UserMsg,
|
|
Mark Wielaard |
44fb31 |
"!? New thread %u starts with SP(%#lx) unmapped\n",
|
|
Mark Wielaard |
44fb31 |
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
|
|
Mark Wielaard |
44fb31 |
index af10b92..725ad78 100644
|
|
Mark Wielaard |
44fb31 |
--- a/coregrind/m_syswrap/syswrap-linux.c
|
|
Mark Wielaard |
44fb31 |
+++ b/coregrind/m_syswrap/syswrap-linux.c
|
|
Mark Wielaard |
44fb31 |
@@ -52,6 +52,7 @@
|
|
Mark Wielaard |
44fb31 |
#include "pub_core_options.h"
|
|
Mark Wielaard |
44fb31 |
#include "pub_core_scheduler.h"
|
|
Mark Wielaard |
44fb31 |
#include "pub_core_signals.h"
|
|
Mark Wielaard |
44fb31 |
+#include "pub_core_stacks.h"
|
|
Mark Wielaard |
44fb31 |
#include "pub_core_syscall.h"
|
|
Mark Wielaard |
44fb31 |
#include "pub_core_syswrap.h"
|
|
Mark Wielaard |
44fb31 |
#include "pub_core_inner.h"
|
|
Mark Wielaard |
44fb31 |
@@ -162,6 +163,10 @@ static void run_a_thread_NORETURN ( Word tidW )
|
|
Mark Wielaard |
44fb31 |
c = VG_(count_living_threads)();
|
|
Mark Wielaard |
44fb31 |
vg_assert(c >= 1); /* stay sane */
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
+ /* Deregister thread's stack. */
|
|
Mark Wielaard |
44fb31 |
+ if (tst->os_state.stk_id != NULL_STK_ID)
|
|
Mark Wielaard |
44fb31 |
+ VG_(deregister_stack)(tst->os_state.stk_id);
|
|
Mark Wielaard |
44fb31 |
+
|
|
Mark Wielaard |
44fb31 |
// Tell the tool this thread is exiting
|
|
Mark Wielaard |
44fb31 |
VG_TRACK( pre_thread_ll_exit, tid );
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
diff --git a/coregrind/pub_core_threadstate.h b/coregrind/pub_core_threadstate.h
|
|
Mark Wielaard |
44fb31 |
index f3d956c..3307e75 100644
|
|
Mark Wielaard |
44fb31 |
--- a/coregrind/pub_core_threadstate.h
|
|
Mark Wielaard |
44fb31 |
+++ b/coregrind/pub_core_threadstate.h
|
|
Mark Wielaard |
44fb31 |
@@ -114,6 +114,8 @@ typedef
|
|
Mark Wielaard |
44fb31 |
ThreadArchState;
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
+#define NULL_STK_ID (~(UWord)0)
|
|
Mark Wielaard |
44fb31 |
+
|
|
Mark Wielaard |
44fb31 |
/* OS-specific thread state. IMPORTANT: if you add fields to this,
|
|
Mark Wielaard |
44fb31 |
you _must_ add code to os_state_clear() to initialise those
|
|
Mark Wielaard |
44fb31 |
fields. */
|
|
Mark Wielaard |
44fb31 |
@@ -129,6 +131,12 @@ typedef
|
|
Mark Wielaard |
44fb31 |
Addr valgrind_stack_base; // Valgrind's stack (VgStack*)
|
|
Mark Wielaard |
44fb31 |
Addr valgrind_stack_init_SP; // starting value for SP
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
+ /* Client stack is registered as stk_id (on linux/darwin, by
|
|
Mark Wielaard |
44fb31 |
+ ML_(guess_and_register_stack)).
|
|
Mark Wielaard |
44fb31 |
+ Stack id NULL_STK_ID means that the user stack is not (yet)
|
|
Mark Wielaard |
44fb31 |
+ registered. */
|
|
Mark Wielaard |
44fb31 |
+ UWord stk_id;
|
|
Mark Wielaard |
44fb31 |
+
|
|
Mark Wielaard |
44fb31 |
/* exit details */
|
|
Mark Wielaard |
44fb31 |
Word exitcode; // in the case of exitgroup, set by someone else
|
|
Mark Wielaard |
44fb31 |
Int fatalsig; // fatal signal
|
|
Mark Wielaard |
44fb31 |
@@ -281,10 +289,6 @@ typedef
|
|
Mark Wielaard |
44fb31 |
the 64-bit offset associated with a %fs value of zero. */
|
|
Mark Wielaard |
44fb31 |
# endif
|
|
Mark Wielaard |
44fb31 |
|
|
Mark Wielaard |
44fb31 |
- /* Stack id (value (UWord)(-1) means that there is no stack). This
|
|
Mark Wielaard |
44fb31 |
- tracks a stack that is set in restore_stack(). */
|
|
Mark Wielaard |
44fb31 |
- UWord stk_id;
|
|
Mark Wielaard |
44fb31 |
-
|
|
Mark Wielaard |
44fb31 |
/* Simulation of the kernel's lwp->lwp_ustack. Set in the PRE wrapper
|
|
Mark Wielaard |
44fb31 |
of the getsetcontext syscall, for SETUSTACK. Used in
|
|
Mark Wielaard |
44fb31 |
VG_(save_context)(), VG_(restore_context)() and
|