diff --git a/source/RobotAPI/libraries/armem/client/Reader.cpp b/source/RobotAPI/libraries/armem/client/Reader.cpp index 48efb7bb961e910356890028b566b321eec9ce91..39fb858bd730ec537ef5c42d87274be0889eedb9 100644 --- a/source/RobotAPI/libraries/armem/client/Reader.cpp +++ b/source/RobotAPI/libraries/armem/client/Reader.cpp @@ -47,7 +47,6 @@ namespace armarx::armem::client try { - ARMARX_TRACE; result = readingPrx->query(input); } catch (const Ice::LocalException& e) diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp index 699a41d01deb04d6658a42fe2100b1a7503fde86..e7d418efb8fbb70f87eb41aab66ac03a82c3d368 100644 --- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp +++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp @@ -256,7 +256,6 @@ namespace armarx::armem::gui const armem::wm::Memory* MemoryViewer::getSingleMemoryData(const std::string& memoryName) { - std::scoped_lock l(memoryDataMutex); auto it = memoryData.find(memoryName); if (it == memoryData.end()) { @@ -313,7 +312,6 @@ namespace armarx::armem::gui void MemoryViewer::startLTMRecording() { - std::scoped_lock l(memoryReaderMutex); TIMING_START(MemoryStartRecording); @@ -334,7 +332,6 @@ namespace armarx::armem::gui void MemoryViewer::stopLTMRecording() { - std::scoped_lock l(memoryReaderMutex); TIMING_START(MemoryStopRecording); @@ -354,7 +351,6 @@ namespace armarx::armem::gui void MemoryViewer::commit() { - std::scoped_lock l(memoryWriterMutex); TIMING_START(Commit); auto now = armem::Time::Now(); @@ -401,7 +397,6 @@ namespace armarx::armem::gui void MemoryViewer::storeOnDisk(QString directory) { - std::scoped_lock l(memoryDataMutex); TIMING_START(MemoryExport) std::string status; @@ -415,7 +410,6 @@ namespace armarx::armem::gui void MemoryViewer::loadFromDisk(QString directory) { - std::scoped_lock l(memoryWriterMutex); std::string status; std::map<std::string, wm::Memory> data = @@ -481,8 +475,6 @@ namespace armarx::armem::gui void MemoryViewer::startDueQueries() { - std::scoped_lock l(memoryReaderMutex); - std::scoped_lock l2(runningQueriesMutex); armem::client::QueryInput input = memoryGroup->queryInput(); int recursionDepth = memoryGroup->queryWidget()->queryLinkRecursionDepth(); @@ -524,8 +516,6 @@ namespace armarx::armem::gui std::map<std::string, client::QueryResult> MemoryViewer::collectQueryResults() { - std::scoped_lock l(memoryReaderMutex); - std::scoped_lock l2(runningQueriesMutex); TIMING_START(tCollectQueryResults) @@ -578,7 +568,6 @@ namespace armarx::armem::gui void MemoryViewer::applyQueryResults(const std::map<std::string, client::QueryResult>& results, int* outErrorCount) { - std::scoped_lock l(memoryDataMutex); TIMING_START(tProcessQueryResults) for (const auto& [name, result] : results) { @@ -649,7 +638,6 @@ namespace armarx::armem::gui void MemoryViewer::updateInstanceTree(const armem::MemoryID& selectedID) { - std::scoped_lock l(memoryDataMutex); const armem::wm::Memory* data = getSingleMemoryData(selectedID.memoryName); if (data) { @@ -701,7 +689,6 @@ namespace armarx::armem::gui void MemoryViewer::resolveMemoryID(const MemoryID& id) { - std::scoped_lock l(memoryDataMutex); // ARMARX_IMPORTANT << "Resolving memory ID: " << id; auto handleError = [this](const std::string& msg) @@ -773,9 +760,6 @@ namespace armarx::armem::gui void MemoryViewer::updateAvailableMemories() { - std::scoped_lock l(memoryReaderMutex); - std::scoped_lock l2(memoryWriterMutex); - if (is_connected and mns) // mns must be connected and mns must be available { try @@ -806,7 +790,6 @@ namespace armarx::armem::gui void MemoryViewer::updateMemoryTree() { - std::scoped_lock l(memoryDataMutex); std::map<std::string, const armem::wm::Memory*> convMap; for (auto& [name, data] : memoryData) { @@ -945,7 +928,6 @@ namespace armarx::armem::gui const armarx::DateTime& timestamp, const std::string& engineID) { - std::scoped_lock l(memoryReaderMutex); std::stringstream errorStream; auto showError = [this, &errorStream]()