DPL: avoid concurrent access to mPendingRegionInfos (#4713)

ktf · web-flow · commit 254fa66ecd46 · 2020-10-29T19:10:38.000+01:00
diff --git a/Framework/Core/src/DataProcessingDevice.cxx b/Framework/Core/src/DataProcessingDevice.cxx
@@ -451,11 +451,14 @@ bool DataProcessingDevice::ConditionalRun()
 
   // Notify on the main thread the new region callbacks, making sure
   // no callback is issued if there is something still processing.
-  if (mPendingRegionInfos.empty() == false) {
-    std::vector<FairMQRegionInfo> toBeNotified;
-    toBeNotified.swap(mPendingRegionInfos); // avoid any MT issue.
-    for (auto const& info : toBeNotified) {
-      mServiceRegistry.get<CallbackService>()(CallbackService::Id::RegionInfoCallback, info);
+  {
+    std::lock_guard<std::mutex> lock(mRegionInfoMutex);
+    if (mPendingRegionInfos.empty() == false) {
+      std::vector<FairMQRegionInfo> toBeNotified;
+      toBeNotified.swap(mPendingRegionInfos); // avoid any MT issue.
+      for (auto const& info : toBeNotified) {
+        mServiceRegistry.get<CallbackService>()(CallbackService::Id::RegionInfoCallback, info);
+      }
     }
   }
   // Synchronous execution of the callbacks. This will be moved in the
