Merge branch 'thread.CaloSimEventTPCnv-20220518' into 'master'

CaloSimEventTPCnv: Enable thread-safety checking.

See merge request atlas/athena!53431

Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CaloSimEventTPCnv )
@@ -22,28 +22,27 @@ atlas_add_dictionary( OLD_CaloSimEventTPCnvDict
 atlas_add_test( CaloCalibrationHitCnv_p1_test
                 SOURCES
                 test/CaloCalibrationHitCnv_p1_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv )
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils )
 
 atlas_add_test( CaloCalibrationHitCnv_p2_test
                 SOURCES
                 test/CaloCalibrationHitCnv_p2_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv )
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils )
 
 atlas_add_test( CaloCalibrationHitContainerCnv_p1_test
                 SOURCES
                 test/CaloCalibrationHitContainerCnv_p1_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils
                 LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
 
 atlas_add_test( CaloCalibrationHitContainerCnv_p2_test
                 SOURCES
                 test/CaloCalibrationHitContainerCnv_p2_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils
                 LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
 
 atlas_add_test( CaloCalibrationHitContainerCnv_p3_test
                 SOURCES
                 test/CaloCalibrationHitContainerCnv_p3_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils
                 LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
-

Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/ATLAS_CHECK_THREAD_SAFETY

+Calorimeter/CaloCnv/CaloSimEventTPCnv

Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,12 +12,13 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -43,7 +42,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;

Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,12 +12,13 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -44,7 +43,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;

Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,7 +27,7 @@ void compare (const CaloCalibrationHit& h1,
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   MsgStream log (0, "test");
@@ -66,7 +65,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;

Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,7 +27,7 @@ void compare (const CaloCalibrationHit& h1,
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   MsgStream log (0, "test");
@@ -67,7 +66,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;

Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p3.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,7 +27,7 @@ void compare (const CaloCalibrationHit& h1,
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   MsgStream log (0, "test");
@@ -70,7 +69,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;