commit 0c0cd77a6ffda2fd1abf4877ef125889c2e07f9e
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Mar 03 19:59:20 2011 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Mar 03 19:59:20 2011 +0000
tree 51231395ed246a0fb38b1102285ad70f475343e0
parent 49d5a28f8a578c1adecb56117e74b97e528a3946

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 a5019735-40e9-0310-863c-91ae7b9d1cf9

drd/drd_thread.c

diff --git a/drd/drd_thread.c b/drd/drd_thread.c
index a31531e..95f13d6 100644
--- a/drd/drd_thread.c
+++ b/drd/drd_thread.c
@@ -529,7 +529,9 @@
              && 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);
 }
 
 /**