Merge branch 'thread.DataModelAthenaPool-20200901' into 'master'

DataModelAthenaPool+TrkEventCnvTools: Enable thread-safety checker.

See merge request atlas/athena!36087

Control/DataModelAthenaPool/DataModelAthenaPool/ATLAS_CHECK_THREAD_SAFETY

+Control/DataModelAthenaPool

Control/DataModelAthenaPool/src/DataVectorConvert.cxx

@@ -14,6 +14,7 @@
 #include "TClass.h"
 #include "TBuffer.h"
 #include "RootUtils/TClassEditRootUtils.h"
+#include "CxxUtils/checker_macros.h"
 #include "TMemberStreamer.h"
 #include "TStreamerElement.h"
 #include "TStreamerInfo.h"
@@ -26,6 +27,7 @@
 #include <sstream>
 #include <cstring>
 #include <algorithm>
+#include <mutex>
 
 
 namespace {
@@ -421,10 +423,6 @@ void test_dv (RootUtils::ILogger* logfn,
 }
 
 
-// List of classes we've already processed.
-std::vector<TClass*> s_seen;
-
-
 } // anonymous namespace
 
 
@@ -443,6 +441,12 @@ namespace DataModelAthenaPool {
  */
 void DataVectorConvert::initialize (RootUtils::ILogger* logfn /* = 0*/)
 {
+  static std::mutex m;
+  std::lock_guard<std::mutex> lock (m);
+
+  // List of classes we've already processed.
+  static std::vector<TClass*> s_seen ATLAS_THREAD_SAFE;
+
   TIter next (gROOT->GetListOfClasses());
   while (TClass* cls = dynamic_cast<TClass*> (next())) {
     if (std::strncmp (cls->GetName(), "DataVector<", 11) == 0) {

Control/DataModelAthenaPool/test/DataLink_p2_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -53,7 +53,7 @@ void test1()
 
 int main()
 {
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
@@ -80,7 +80,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
@@ -91,7 +91,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkCnv_p2_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
@@ -77,7 +77,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkCnv_p3_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
@@ -109,7 +109,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkVectorCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
@@ -150,7 +150,7 @@ void test2()
 int main()
 {
   std::cout << "DataModelAthenaPool/NavigableCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   test2();
   return 0;

Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
@@ -140,7 +140,7 @@ void test2()
 int main()
 {
   std::cout << "DataModelAthenaPool/NavigableCnv_p2_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   test2();
   return 0;

Control/DataModelAthenaPool/test/VectorElementLinkCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file  DataModelAthenaPool/test/VectorElementLinkCnv_p1_test.cxx
@@ -102,7 +102,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/VectorElementLinkCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Tracking/TrkEventCnv/TrkEventCnvTools/TrkEventCnvTools/ATLAS_CHECK_THREAD_SAFETY

+Tracking/TrkEventCnv/TrkEventCnvTools