DRD: avoid triggering an assertion failure if a thread is canceled while waiting...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11578

diff --git a/drd/drd_thread.c b/drd/drd_thread.c
index a31531ed9de63ef27c81f5f12c6f2809c29d7e68..95f13d6332ba50902a669b2b7033230bdb6401d1 100644 (file)
--- 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);
 }
 
 /**