From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 3 Mar 2011 19:59:20 +0000 (+0000)
Subject: DRD: avoid triggering an assertion failure if a thread is canceled while waiting... 
X-Git-Tag: svn/VALGRIND_3_7_0~651
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab798ee7e47b6240143fdabb3db3e76d471fa38c;p=thirdparty%2Fvalgrind.git

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
---

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);
 }
 
 /**