OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[sanitizer] a bit more informative deadlock detector report (still lots to improve) 

llvm-svn: 204115
This commit is contained in:
Kostya Serebryany 2014-03-18 05:56:14 +00:00
parent 42b233a836
commit 5c0171b811
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler-rt/lib/tsan/rtl/tsan_report.cc
View File

@ -231,17 +231,25 @@ void PrintReport(const ReportDesc *rep) {
Printf("%s", d.EndWarning());
if (rep->typ == ReportTypeDeadlock) {
Printf(" path: ");
Printf(" Path: ");
CHECK_GT(rep->mutexes.Size(), 0U);
CHECK_EQ(rep->mutexes.Size() * 2, rep->stacks.Size());
for (uptr i = 0; i < rep->mutexes.Size(); i++)
PrintMutexShort(rep->mutexes[i], " => ");
PrintMutexShort(rep->mutexes[0], "\n");
}
for (uptr i = 0; i < rep->stacks.Size(); i++) {
if (i)
Printf(" and:\n");
PrintStack(rep->stacks[i]);
PrintMutexShort(rep->mutexes[0], "\n\n");
for (uptr i = 0; i < rep->mutexes.Size(); i++) {
Printf(" Edge: ");
PrintMutexShort(rep->mutexes[i], " => ");
PrintMutexShort(rep->mutexes[(i+1) % rep->mutexes.Size()], "\n");
PrintStack(rep->stacks[2*i]);
PrintStack(rep->stacks[2*i+1]);
}
} else {
for (uptr i = 0; i < rep->stacks.Size(); i++) {
if (i)
Printf(" and:\n");
PrintStack(rep->stacks[i]);
}
}
for (uptr i = 0; i < rep->mops.Size(); i++)

4
compiler-rt/test/tsan/deadlock_detector_stress_test.cc
View File

@ -151,7 +151,7 @@ class LockTest {
Lock_0_1();
Lock_1_0();
// CHECK: WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock)
// CHECK: path: [[M1:M[0-9]+]] => [[M2:M[0-9]+]] => [[M1]]
// CHECK: Path: [[M1:M[0-9]+]] => [[M2:M[0-9]+]] => [[M1]]
// CHECK: Mutex [[M1]] ([[A1]]) created at:
// CHECK: Mutex [[M2]] ([[A2]]) created at:
// CHECK-NOT: WARNING: ThreadSanitizer:
@ -169,7 +169,7 @@ class LockTest {
Lock2(1, 2);
Lock2(2, 0);
// CHECK: WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock)
// CHECK: path: [[M1:M[0-9]+]] => [[M2:M[0-9]+]] => [[M3:M[0-9]+]] => [[M1]]
// CHECK: Path: [[M1:M[0-9]+]] => [[M2:M[0-9]+]] => [[M3:M[0-9]+]] => [[M1]]
// CHECK: Mutex [[M1]] ([[A1]]) created at:
// CHECK: Mutex [[M2]] ([[A2]]) created at:
// CHECK: Mutex [[M3]] ([[A3]]) created at: