maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[sanitizer] use some c++11 to simplify the code (we can now). Fix one place where a mutex acquisition stack trace was not properly remembered 

llvm-svn: 204237
This commit is contained in:
Kostya Serebryany 2014-03-19 14:19:31 +00:00
parent dbff5c71fa
commit 78f2e7bd62
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector.h
View File

@ -56,7 +56,7 @@ class DeadlockDetectorTLS {
// Returns true if this is the first (non-recursive) acquisition of this lock. // Returns true if this is the first (non-recursive) acquisition of this lock.
bool addLock(uptr lock_id, uptr current_epoch, u32 stk) { bool addLock(uptr lock_id, uptr current_epoch, u32 stk) {
// Printf("addLock: %zx %zx\n", lock_id, current_epoch); // Printf("addLock: %zx %zx stk %u\n", lock_id, current_epoch, stk);
CHECK_EQ(epoch_, current_epoch); CHECK_EQ(epoch_, current_epoch);
if (!bv_.setBit(lock_id)) { if (!bv_.setBit(lock_id)) {
// The lock is already held by this thread, it must be recursive. // The lock is already held by this thread, it must be recursive.
@ -66,9 +66,9 @@ class DeadlockDetectorTLS {
} }
if (stk) { if (stk) {
CHECK_LT(n_all_locks_, ARRAY_SIZE(all_locks_with_contexts_)); CHECK_LT(n_all_locks_, ARRAY_SIZE(all_locks_with_contexts_));
LockWithContext &l = all_locks_with_contexts_[n_all_locks_++]; // lock_id < BV::kSize, can cast to a smaller int.
l.lock = static_cast<u32>(lock_id); // lock_id is small index into bv_. u32 lock_id_short = static_cast<u32>(lock_id);
l.stk = stk; all_locks_with_contexts_[n_all_locks_++] = {lock_id_short, stk};
} }
return true; return true;
} }
@ -239,8 +239,8 @@ class DeadlockDetector {
added_edges, ARRAY_SIZE(added_edges)); added_edges, ARRAY_SIZE(added_edges));
for (uptr i = 0; i < n_added_edges; i++) { for (uptr i = 0; i < n_added_edges; i++) {
if (n_edges_ < ARRAY_SIZE(edges_)) if (n_edges_ < ARRAY_SIZE(edges_))
edges_[n_edges_++] = Edge((u16)added_edges[i], (u16)cur_idx, edges_[n_edges_++] = {(u16)added_edges[i], (u16)cur_idx,
dtls->findLockContext(added_edges[i]), stk); dtls->findLockContext(added_edges[i]), stk};
// Printf("E%zd: %u %zd=>%zd\n", n_edges_, stk, added_edges[i], cur_idx); // Printf("E%zd: %u %zd=>%zd\n", n_edges_, stk, added_edges[i], cur_idx);
} }
return n_added_edges; return n_added_edges;
@ -322,7 +322,7 @@ class DeadlockDetector {
// (modulo racy nature of hasAllEdges). // (modulo racy nature of hasAllEdges).
bool onLockFast(DeadlockDetectorTLS<BV> *dtls, uptr node, u32 stk = 0) { bool onLockFast(DeadlockDetectorTLS<BV> *dtls, uptr node, u32 stk = 0) {
if (hasAllEdges(dtls, node)) { if (hasAllEdges(dtls, node)) {
dtls->addLock(nodeToIndexUnchecked(node), nodeToEpoch(node), 0); dtls->addLock(nodeToIndexUnchecked(node), nodeToEpoch(node), stk);
return true; return true;
} }
return false; return false;
@ -381,10 +381,6 @@ class DeadlockDetector {
u16 to; u16 to;
u32 stk_from; u32 stk_from;
u32 stk_to; u32 stk_to;
// FIXME: replace with initializer list once the tests are built as c++11.
Edge(u16 f, u16 t, u32 sf, u32 st)
: from(f), to(t), stk_from(sf), stk_to(st) {}
Edge() {}
}; };
uptr current_epoch_; uptr current_epoch_;

2
compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector1.cc
View File

@ -143,7 +143,7 @@ void DD::ReportDeadlock(DDCallback *cb, DDMutex *m) {
void DD::MutexAfterLock(DDCallback *cb, DDMutex *m, bool wlock, bool trylock) { void DD::MutexAfterLock(DDCallback *cb, DDMutex *m, bool wlock, bool trylock) {
DDLogicalThread *lt = cb->lt; DDLogicalThread *lt = cb->lt;
u32 stk = cb->Unwind(); // FIXME: if this is hot, do this under a flag. u32 stk = cb->Unwind(); // FIXME: if this is hot, do this under a flag.
// Printf("T%p MutexLock: %zx\n", lt, m->id); // Printf("T%p MutexLock: %zx stk %u\n", lt, m->id, stk);
if (dd.onFirstLock(&lt->dd, m->id, stk)) if (dd.onFirstLock(&lt->dd, m->id, stk))
return; return;
if (dd.onLockFast(&lt->dd, m->id, stk)) if (dd.onLockFast(&lt->dd, m->id, stk))