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

TrackParticleTPCnv: Enable thread-safety checking.

See merge request !53434

Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/ATLAS_CHECK_THREAD_SAFETY

+Reconstruction/TrackParticleTPCnv

Reconstruction/TrackParticleTPCnv/src/TrackParticleContainerCnv_tlp1.cxx

@@ -3,6 +3,7 @@
 */
 
 #include "TrackParticleTPCnv/TrackParticleContainerCnv_tlp1.h"
+#include "CxxUtils/checker_macros.h"
 
 TrackParticleContainerCnv_tlp1::TrackParticleContainerCnv_tlp1()
 {
@@ -161,7 +162,12 @@ persToTrans (const Rec::TrackParticleContainer_tlp1* pers,
              Rec::TrackParticleContainer* trans,
              MsgStream& msg)
 {
-  setPStorage (const_cast<Rec::TrackParticleContainer_tlp1*> (pers));
+    // FIXME: TPConverter uses the same non-const member m_pStorage
+    // for both reading and writing, but we want it to be const
+    // in the former case.
+    Rec::TrackParticleContainer_tlp1* pers_nc ATLAS_THREAD_SAFE =
+      const_cast<Rec::TrackParticleContainer_tlp1*> (pers);
+    setPStorage (pers_nc);
   m_mainConverter.pstoreToTrans (0, trans, msg);
 }
 

Reconstruction/TrackParticleTPCnv/src/TrackParticleContainerCnv_tlp2.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
 */
 
 #include "TrackParticleTPCnv/TrackParticleContainerCnv_tlp2.h"
+#include "CxxUtils/checker_macros.h"
 
 TrackParticleContainerCnv_tlp2::TrackParticleContainerCnv_tlp2()
 {
@@ -124,7 +125,12 @@ void TrackParticleContainerCnv_tlp2::setPStorage( Rec::TrackParticleContainer_tl
 
 void T_TPCnv<Rec::TrackParticleContainer, Rec::TrackParticleContainer_tlp2 >::
 persToTrans (const Rec::TrackParticleContainer_tlp2* pers, Rec::TrackParticleContainer* trans, MsgStream& msg){
-    setPStorage (const_cast<Rec::TrackParticleContainer_tlp2*> (pers));
+    // FIXME: TPConverter uses the same non-const member m_pStorage
+    // for both reading and writing, but we want it to be const
+    // in the former case.
+    Rec::TrackParticleContainer_tlp2* pers_nc ATLAS_THREAD_SAFE =
+      const_cast<Rec::TrackParticleContainer_tlp2*> (pers);
+    setPStorage (pers_nc);
     m_mainConverter.pstoreToTrans (0, trans, msg);
 }
 

Reconstruction/TrackParticleTPCnv/src/TrackParticleContainerCnv_tlp3.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
 */
 
 #include "TrackParticleTPCnv/TrackParticleContainerCnv_tlp3.h"
+#include "CxxUtils/checker_macros.h"
 
 TrackParticleContainerCnv_tlp3::TrackParticleContainerCnv_tlp3(bool nosurf /*= false*/)
   : m_trackParametersCnv (nosurf)
@@ -29,8 +30,14 @@ void TrackParticleContainerCnv_tlp3::setPStorage( Rec::TrackParticleContainer_tl
 
 
 void T_TPCnv<Rec::TrackParticleContainer, Rec::TrackParticleContainer_tlp3 >::
-persToTrans (const Rec::TrackParticleContainer_tlp3* pers, Rec::TrackParticleContainer* trans, MsgStream& msg){
-    setPStorage (const_cast<Rec::TrackParticleContainer_tlp3*> (pers));
+persToTrans (const Rec::TrackParticleContainer_tlp3* pers, Rec::TrackParticleContainer* trans, MsgStream& msg)
+{
+    // FIXME: TPConverter uses the same non-const member m_pStorage
+    // for both reading and writing, but we want it to be const
+    // in the former case.
+    Rec::TrackParticleContainer_tlp3* pers_nc ATLAS_THREAD_SAFE =
+      const_cast<Rec::TrackParticleContainer_tlp3*> (pers);
+    setPStorage (pers_nc);
     m_mainConverter.pstoreToTrans (0, trans, msg);
 }