Device: synchronize access to transports container

FairRootGroup · Feb 22, 2023 · 7bf1d36 · 7bf1d36
1 parent ae7bc6f
commit 7bf1d36
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/fairmq/Device.cxx b/fairmq/Device.cxx
@@ -650,6 +650,8 @@ bool Device::HandleMultipartInput(const string& chName, const InputMultipartCall
 
 shared_ptr<TransportFactory> Device::AddTransport(mq::Transport transport)
 {
+    lock_guard<mutex> lock(fTransportMtx);
+
     if (transport == mq::Transport::DEFAULT) {
         transport = fDefaultTransportType;
     }
@@ -769,13 +771,15 @@ void Device::LogSocketRates()
 
 void Device::InterruptTransports()
 {
+    lock_guard<mutex> lock(fTransportMtx);
     for (auto& [transportType, transport] : fTransports) {
         transport->Interrupt();
     }
 }
 
 void Device::ResumeTransports()
 {
+    lock_guard<mutex> lock(fTransportMtx);
     for (auto& [transportType, transport] : fTransports) {
         transport->Resume();
     }
@@ -792,14 +796,17 @@ void Device::ResetTaskWrapper()
 
 void Device::ResetWrapper()
 {
-    for (auto& [transportType, transport] : fTransports) {
-        transport->Reset();
+    {
+        lock_guard<mutex> lock(fTransportMtx);
+        for (auto& [transportType, transport] : fTransports) {
+            transport->Reset();
+        }
+        fTransports.clear();
     }
 
     Reset();
 
     fChannels.clear();
-    fTransports.clear();
     fTransportFactory.reset();
     if (!NewStatePending()) {
         ChangeState(Transition::Auto);

diff --git a/fairmq/Device.h b/fairmq/Device.h
@@ -637,6 +637,7 @@ class Device
 
     StateQueue fStateQueue;
 
+    std::mutex fTransportMtx;   ///< guards access to transports container
     std::mutex fTransitionMtx;
     bool fTransitioning;
 };