Merge #15410: test: txindex: interrupt threadGroup before calling destructor

MarcoFalke · MarcoFalke · commit f9d50e83e290 · 2019-02-16T12:58:26.000-05:00
fab6b07 test: txindex: interrupt threadGroup before calling destructor (MarcoFalke) Pull request description: Fixes the data races with the tread sanitizer such as * https://travis-ci.org/MarcoFalke/bitcoin/jobs/492330554 * bitcoin/bitcoin#15402 (comment) * ... Tree-SHA512: 40608c70d92a1dd68efc1d41eecc8e2fb7738508e21f91f0ad353adcceed60fa624f15bf72a5b69a9444157b261183abbe9fc4cc5dd8aebc1c49506b239e8e88
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
@@ -69,7 +69,13 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
         }
     }
 
-    txindex.Stop(); // Stop thread before calling destructor
+    // shutdown sequence (c.f. Shutdown() in init.cpp)
+    txindex.Stop();
+
+    threadGroup.interrupt_all();
+    threadGroup.join_all();
+
+    // Rest of shutdown sequence and destructors happen in ~TestingSetup()
 }
 
 BOOST_AUTO_TEST_SUITE_END()

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,13 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- txindex.Stop(); // Stop thread before calling destructor`
	`72`	`+ // shutdown sequence (c.f. Shutdown() in init.cpp)`
	`73`	`+ txindex.Stop();`
	`74`	`+`
	`75`	`+ threadGroup.interrupt_all();`
	`76`	`+ threadGroup.join_all();`
	`77`	`+`
	`78`	`+ // Rest of shutdown sequence and destructors happen in ~TestingSetup()`
`73`	`79`	`}`
`74`	`80`
`75`	`81`	`BOOST_AUTO_TEST_SUITE_END()`