|
From: <sv...@va...> - 2011-03-03 19:59:37
|
Author: bart
Date: 2011-03-03 19:59:20 +0000 (Thu, 03 Mar 2011)
New Revision: 11578
Log:
DRD: avoid triggering an assertion failure if a thread is canceled while waiting inside pthread_mutex_lock(). Fixes #267413.
Modified:
trunk/drd/drd_thread.c
Modified: trunk/drd/drd_thread.c
===================================================================
--- trunk/drd/drd_thread.c 2011-02-28 10:26:42 UTC (rev 11577)
+++ trunk/drd/drd_thread.c 2011-03-03 19:59:20 UTC (rev 11578)
@@ -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);
}
/**
|