Add ATLAS_CHECK_THREAD_SAFETY to TrkParametersIdentificationHelpers,TrkRIO_OnTrack,TrkTrackLink

Tracking/TrkEvent/TrkParametersIdentificationHelpers/TrkParametersIdentificationHelpers/ATLAS_CHECK_THREAD_SAFETY

+Tracking/TrkEvent/TrkParametersIdentificationHelpers

Tracking/TrkEvent/TrkParametersIdentificationHelpers/TrkParametersIdentificationHelpers/TrackParametersIdHelper.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRK_TRACKPARAMETERSIDHELPER_H
@@ -45,13 +45,13 @@ namespace Trk {
     /** set version bits */
     void setVersion( TrackParametersIdentifier& id ) const;
 
-    static unsigned int           m_version;
-    static BitField<unsigned int> m_validField;
-    static BitField<unsigned int> m_versionField;
-    static BitField<unsigned int> m_technologyField;
+    static const unsigned int           m_version;
+    static const BitField<unsigned int> m_validField;
+    static const BitField<unsigned int> m_versionField;
+    static const BitField<unsigned int> m_technologyField;
 
-    static BitField<unsigned int> m_isEntryToLayerField;
-    static BitField<unsigned int> m_caloSamplingField;
+    static const BitField<unsigned int> m_isEntryToLayerField;
+    static const BitField<unsigned int> m_caloSamplingField;
 
   };
 

Tracking/TrkEvent/TrkParametersIdentificationHelpers/TrkParametersIdentificationHelpers/TrackParametersIdentificationHelper.h

@@ -24,7 +24,7 @@ namespace Trk {
     
   
   private:
-    static TrackParametersIdHelper m_helper;
+    static const TrackParametersIdHelper m_helper;
   };
 
   inline TrackParametersIdentifier TrackParametersIdentificationHelper::getIdentifier( const CurvilinearParameters& pars ) {

Tracking/TrkEvent/TrkParametersIdentificationHelpers/src/TrackParametersIdHelper.cxx

@@ -6,14 +6,14 @@
 
 namespace Trk {
 
-  unsigned int           TrackParametersIdHelper::m_version = 0;
-  BitField<unsigned int> TrackParametersIdHelper::m_validField(           31, 1 );
+  const unsigned int           TrackParametersIdHelper::m_version = 0;
+  const BitField<unsigned int> TrackParametersIdHelper::m_validField(           31, 1 );
 
-  BitField<unsigned int> TrackParametersIdHelper::m_versionField(         28, 3 );
-  BitField<unsigned int> TrackParametersIdHelper::m_technologyField(      23, 5 );
+  const BitField<unsigned int> TrackParametersIdHelper::m_versionField(         28, 3 );
+  const BitField<unsigned int> TrackParametersIdHelper::m_technologyField(      23, 5 );
 
-  BitField<unsigned int> TrackParametersIdHelper::m_isEntryToLayerField(  5,  2 );
-  BitField<unsigned int> TrackParametersIdHelper::m_caloSamplingField(    0,  5 );
+  const BitField<unsigned int> TrackParametersIdHelper::m_isEntryToLayerField(  5,  2 );
+  const BitField<unsigned int> TrackParametersIdHelper::m_caloSamplingField(    0,  5 );
 
 }
  

Tracking/TrkEvent/TrkParametersIdentificationHelpers/src/TrackParametersIdentificationHelper.cxx

@@ -6,7 +6,7 @@
 
 namespace Trk {
 
-  TrackParametersIdHelper TrackParametersIdentificationHelper::m_helper;
+  const TrackParametersIdHelper TrackParametersIdentificationHelper::m_helper;
 
   TrackParametersIdentifier TrackParametersIdentificationHelper::getIdentifier( const Trk::TrackParameters& pars ) {
     const CurvilinearParameters* cpars = dynamic_cast<const CurvilinearParameters*>(&pars);

Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/ATLAS_CHECK_THREAD_SAFETY

+Tracking/TrkEvent/TrkRIO_OnTrack

Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrack.h

@@ -19,6 +19,8 @@
 #include "Identifier/Identifier.h"
 #include "Identifier/IdentifierHash.h"
 #include <ostream>
+#include <atomic>
+
 class MsgStream;
 class RIO_OnTrackCnv_p1;
 class RIO_OnTrackCnv_p2;
@@ -125,7 +127,7 @@ namespace Trk {
       Identifier m_identifier; 
 
       /** number of objects of this type in memory */
-      static unsigned int s_numberOfInstantiations;
+      static std::atomic<unsigned int> s_numberOfInstantiations;
   };
   
   inline Identifier RIO_OnTrack::identify() const     

Tracking/TrkEvent/TrkRIO_OnTrack/src/RIO_OnTrack.cxx

@@ -17,7 +17,7 @@
 #include <string>
 #include <typeinfo>
 
-unsigned int Trk::RIO_OnTrack::s_numberOfInstantiations=0;
+std::atomic<unsigned int> Trk::RIO_OnTrack::s_numberOfInstantiations{0};
 
 // Constructor with parameters:
 Trk::RIO_OnTrack::RIO_OnTrack(  const Trk::LocalParameters& locpars,

Tracking/TrkEvent/TrkTrackLink/TrkTrackLink/ATLAS_CHECK_THREAD_SAFETY

+Tracking/TrkEvent/TrkTrackLink