From 5f9ee9909cc743ce6201fb21480051d3f5ad2879 Mon Sep 17 00:00:00 2001
From: Jens Georg <jens.georg@desy.de>
Date: Tue, 11 Jun 2019 15:48:38 +0200
Subject: [PATCH] Improve location locking in updater
- Preallocate the unordered set with worst-case size before the loop
- Perform insert and lock in one step using the return value of insert
---
src/DoocsUpdater.cc | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/DoocsUpdater.cc b/src/DoocsUpdater.cc
index ddcd99c..47242dc 100644
--- a/src/DoocsUpdater.cc
+++ b/src/DoocsUpdater.cc
@@ -36,22 +36,26 @@ namespace ChimeraTK {
return;
}
+ // Worst-case: We need to lock all locations, so pre-allocate this here
+ std::unordered_set<EqFct*> locationsToLock;
+ locationsToLock.reserve(_toDoocsEqFctMap.size());
+
ReadAnyGroup group(_elementsToRead.begin(), _elementsToRead.end());
while(true) {
// Wait until any variable got an update
auto notification = group.waitAny();
auto updatedElement = notification.getId();
// Gather all involved locations in a unique set
- std::unordered_set<EqFct*> locationsToLock;
- for(auto& location : _toDoocsEqFctMap[updatedElement]) locationsToLock.insert(location);
- // Lock all involved locations
- for(auto& location : locationsToLock) location->lock();
+ for(auto& location : _toDoocsEqFctMap[updatedElement]) {
+ if(locationsToLock.insert(location).second) location->lock();
+ }
// Complete the read transfer of the process variable
notification.accept();
// Call all updater functions
for(auto& updaterFunction : _toDoocsUpdateMap[updatedElement]) updaterFunction();
// Unlock all involved locations
for(auto& location : locationsToLock) location->unlock();
+ locationsToLock.clear();
// Allow shutting down this thread...
boost::this_thread::interruption_point();
}
--
GitLab