From ab798ee7e47b6240143fdabb3db3e76d471fa38c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 3 Mar 2011 19:59:20 +0000 Subject: [PATCH] DRD: avoid triggering an assertion failure if a thread is canceled while waiting inside pthread_mutex_lock(). Fixes #267413. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11578 --- drd/drd_thread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drd/drd_thread.c b/drd/drd_thread.c index a31531ed9d..95f13d6332 100644 --- a/drd/drd_thread.c +++ b/drd/drd_thread.c @@ -529,7 +529,9 @@ void DRD_(thread_pre_cancel)(const DrdThreadId tid) && tid != DRD_INVALID_THREADID); tl_assert(DRD_(g_threadinfo)[tid].pt_threadid != INVALID_POSIX_THREADID); - DRD_(g_threadinfo)[tid].synchr_nesting = 0; + if (DRD_(thread_get_trace_fork_join)()) + VG_(message)(Vg_UserMsg, "[%d] drd_thread_pre_cancel %d\n", + DRD_(g_drd_running_tid), tid); } /** -- 2.47.3