Merge pull request #38475 from Dr15Jones/threadSafeFebConnectorSpec

Made FebConnectorSpec const thread-safe
cms-sw · Jun 23, 2022 · 0aff7a1 · 0aff7a1
2 parents 86c38c4 + 27f0b69
commit 0aff7a1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/CondFormats/RPCObjects/interface/FebConnectorSpec.h b/CondFormats/RPCObjects/interface/FebConnectorSpec.h
@@ -9,6 +9,7 @@
 #include "CondFormats/RPCObjects/interface/ChamberLocationSpec.h"
 #include "CondFormats/RPCObjects/interface/FebLocationSpec.h"
 #include <string>
+#include <atomic>
 
 /** \class FebConnectorSpec 
  * Specifies the input for LinkBoard. In hardware the data goes through
@@ -24,6 +25,9 @@ class FebConnectorSpec {
 public:
   FebConnectorSpec(int num = -1) : theLinkBoardInputNum(num), theRawId(0) {}
   FebConnectorSpec(int num, const ChamberLocationSpec& chamber, const FebLocationSpec& feb);
+  FebConnectorSpec(FebConnectorSpec const&);
+
+  FebConnectorSpec& operator=(FebConnectorSpec const&);
 
   /// this FEB channel in LinkBoard
   int linkBoardInputNum() const { return theLinkBoardInputNum; }
@@ -35,7 +39,7 @@ class FebConnectorSpec {
   const ChamberStripSpec strip(int pinNumber) const;
 
   /// DetUnit to which data belongs
-  const uint32_t& rawId() const;
+  uint32_t rawId() const;
 
   const ChamberLocationSpec& chamber() const { return theChamber; }
   const FebLocationSpec& feb() const { return theFeb; }
@@ -58,7 +62,7 @@ class FebConnectorSpec {
   FebLocationSpec theFeb;
 
   int theAlgo;
-  mutable uint32_t theRawId COND_TRANSIENT;
+  mutable std::atomic<uint32_t> theRawId COND_TRANSIENT;
 
   COND_SERIALIZABLE;
 };

diff --git a/CondFormats/RPCObjects/src/FebConnectorSpec.cc b/CondFormats/RPCObjects/src/FebConnectorSpec.cc
@@ -6,6 +6,22 @@
 FebConnectorSpec::FebConnectorSpec(int num, const ChamberLocationSpec& chamber, const FebLocationSpec& feb)
     : theLinkBoardInputNum(num), theChamber(chamber), theFeb(feb), theAlgo(0), theRawId(0) {}
 
+FebConnectorSpec::FebConnectorSpec(FebConnectorSpec const& iOther)
+    : theLinkBoardInputNum(iOther.theLinkBoardInputNum),
+      theChamber(iOther.theChamber),
+      theFeb(iOther.theFeb),
+      theAlgo(iOther.theAlgo),
+      theRawId(iOther.theRawId.load()) {}
+
+FebConnectorSpec& FebConnectorSpec::operator=(FebConnectorSpec const& iOther) {
+  theLinkBoardInputNum = iOther.theLinkBoardInputNum;
+  theChamber = iOther.theChamber;
+  theFeb = iOther.theFeb;
+  theAlgo = iOther.theAlgo;
+  theRawId.store(iOther.theRawId.load());
+  return *this;
+}
+
 const ChamberStripSpec FebConnectorSpec::strip(int pinNumber) const {
   int nStrips = theAlgo / 10000;
   int firstChamberStrip = (theAlgo - 10000 * nStrips) / 100;
@@ -61,11 +77,13 @@ const int FebConnectorSpec::cablePinNum(int istrip) const {
   return thePin;
 }
 
-const uint32_t& FebConnectorSpec::rawId() const {
+uint32_t FebConnectorSpec::rawId() const {
   DBSpecToDetUnit toDU;
-  if (!theRawId)
-    theRawId = toDU(theChamber, theFeb);
-  return theRawId;
+  if (!theRawId) {
+    uint32_t expected = 0;
+    theRawId.compare_exchange_strong(expected, toDU(theChamber, theFeb));
+  }
+  return theRawId.load();
 }
 
 std::string FebConnectorSpec::print(int depth) const {