Skip to content

Commit b8e5bbd

Browse files
author
MarcoFalke
committed
Merge #21669: test: Remove spurious double lock tsan suppressions by bumping to clang-12
fadea0b Revert "test: Add tsan supp for leveldb::DBImpl::DeleteObsoleteFiles" (MarcoFalke) fadbd99 test: Remove spurious double lock tsan suppressions by bumping to clang-12 (MarcoFalke) Pull request description: The double lock warnings appeared in #19041, but they didn't make any sense. Also, our sync module would detect double locks, if there were any. Bumping to clang-12 allows us to remove the spurious suppressions needed to run the tests, so do that. ACKs for top commit: practicalswift: cr ACK fadea0b assuming CI passes and more specifically that newer Clang agrees that these TSan suppressions are no longer needed. Tree-SHA512: c411221a4b74d0af6ca8d686639b4f40b41c15906ccbb6647e8d569d6ab088264faafe075e1ac9523d5c0024b85f15a597bb3eedc7f07d4f5816245f75cfc08b
2 parents e7af2f3 + fadea0b commit b8e5bbd

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ task:
120120
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
121121

122122
task:
123-
name: '[depends, sanitizers: thread (TSan), no gui] [focal]'
123+
name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]'
124124
<< : *GLOBAL_TASK_TEMPLATE
125125
container:
126-
image: ubuntu:focal
126+
image: ubuntu:hirsute
127127
cpu: 6 # Increase CPU and Memory to avoid timeout
128128
memory: 24G
129129
env:

ci/test/00_setup_env_native_tsan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
10-
export DOCKER_NAME_TAG=ubuntu:20.04
10+
export DOCKER_NAME_TAG=ubuntu:hirsute
1111
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
1212
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
1313
export GOAL="install"

test/sanitizer_suppressions/tsan

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,12 @@
33
#
44
# https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
55

6-
# double locks (TODO fix)
7-
mutex:g_genesis_wait_mutex
8-
mutex:Interrupt
9-
mutex:CThreadInterrupt
10-
mutex:CConnman::Interrupt
11-
mutex:CConnman::WakeMessageHandler
12-
mutex:CConnman::ThreadOpenConnections
13-
mutex:CConnman::ThreadOpenAddedConnections
14-
mutex:CConnman::SocketHandler
15-
mutex:UpdateTip
16-
mutex:PeerManagerImpl::UpdatedBlockTip
17-
mutex:g_best_block_mutex
18-
196
# race (TODO fix)
20-
race:CConnman::WakeMessageHandler
21-
race:CConnman::ThreadMessageHandler
22-
race:fHaveGenesis
23-
race:ProcessNewBlock
24-
race:ThreadImport
257
race:LoadWallet
268
race:WalletBatch::WriteHDChain
279
race:BerkeleyBatch
2810
race:BerkeleyDatabase
2911
race:DatabaseBatch
30-
race:leveldb::DBImpl::DeleteObsoleteFiles
3112
race:zmq::*
3213
race:bitcoin-qt
3314

0 commit comments

Comments
 (0)