From aa0ea2908e4049c7c5875a01654859bf5958b920 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 11 Jun 2021 17:10:35 +0200
Subject: [PATCH] Pass MNS client by ref to get the update in onConnect()
---
.../armem_objects/client/articulated_object/Reader.cpp | 2 +-
.../armem_objects/client/articulated_object/Reader.h | 4 ++--
.../armem_objects/client/articulated_object/Writer.cpp | 2 +-
.../armem_objects/client/articulated_object/Writer.h | 4 ++--
.../libraries/armem_objects/client/attachment/Reader.cpp | 2 +-
.../libraries/armem_objects/client/attachment/Reader.h | 4 ++--
.../libraries/armem_objects/client/attachment/Writer.cpp | 2 +-
.../libraries/armem_objects/client/attachment/Writer.h | 4 ++--
.../libraries/armem_robot_mapping/MappingDataReader.cpp | 2 +-
.../libraries/armem_robot_mapping/MappingDataReader.h | 4 ++--
.../libraries/armem_robot_mapping/MappingDataWriter.cpp | 2 +-
.../libraries/armem_robot_mapping/MappingDataWriter.h | 4 ++--
.../libraries/armem_robot_state/client/common/RobotReader.cpp | 2 +-
.../libraries/armem_robot_state/client/common/RobotReader.h | 4 ++--
.../armem_robot_state/client/common/VirtualRobotReader.cpp | 2 +-
.../armem_robot_state/client/common/VirtualRobotReader.h | 2 +-
.../armem_robot_state/client/localization/TransformReader.cpp | 2 +-
.../armem_robot_state/client/localization/TransformReader.h | 4 ++--
.../armem_robot_state/client/localization/TransformWriter.cpp | 2 +-
.../armem_robot_state/client/localization/TransformWriter.h | 4 ++--
20 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
index 1457fc466..e94cfbc11 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
@@ -19,7 +19,7 @@ namespace fs = ::std::filesystem;
namespace armarx::armem::articulated_object
{
- Reader::Reader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Reader::Reader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h
index b4c908a36..d7a0d3c75 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h
@@ -38,7 +38,7 @@ namespace armarx::armem::articulated_object
virtual public ReaderInterface
{
public:
- Reader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Reader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Reader() = default;
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
@@ -75,7 +75,7 @@ namespace armarx::armem::articulated_object
const std::string propertyPrefix = "mem.obj.articulated.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
index d74c8d865..04dc6d4bf 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
@@ -20,7 +20,7 @@
namespace armarx::armem::articulated_object
{
- Writer::Writer(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Writer::Writer(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h
index d9ce15069..62629b674 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h
@@ -39,7 +39,7 @@ namespace armarx::armem::articulated_object
virtual public WriterInterface
{
public:
- Writer(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Writer(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Writer() = default;
@@ -79,7 +79,7 @@ namespace armarx::armem::articulated_object
const std::string propertyPrefix = "mem.obj.articulated.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp
index 64d8003fb..f723f30b2 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp
@@ -74,7 +74,7 @@ namespace armarx::armem::attachment
}
} // namespace
- Reader::Reader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Reader::Reader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h
index 9149cbd5a..1080156c8 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h
@@ -36,7 +36,7 @@ namespace armarx::armem::attachment
class Reader
{
public:
- Reader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Reader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Reader() = default;
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
@@ -59,7 +59,7 @@ namespace armarx::armem::attachment
const std::string propertyPrefix = "mem.obj.attachment.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
std::mutex memoryWriterMutex;
};
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp
index dc520d226..69f5806c2 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp
@@ -19,7 +19,7 @@
namespace armarx::armem::attachment
{
- Writer::Writer(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Writer::Writer(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h
index df85beca8..754f4f280 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h
@@ -38,7 +38,7 @@ namespace armarx::armem::attachment
class Writer
{
public:
- Writer(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Writer(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Writer() = default;
@@ -61,7 +61,7 @@ namespace armarx::armem::attachment
const std::string propertyPrefix = "mem.obj.articulated.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
index a2394a26a..b9caa0773 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
@@ -53,7 +53,7 @@
namespace armarx::armem
{
- MappingDataReader::MappingDataReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ MappingDataReader::MappingDataReader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h
index 39332417b..2479b9413 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h
@@ -64,7 +64,7 @@ namespace armarx::armem
{
public:
- MappingDataReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ MappingDataReader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~MappingDataReader();
void connect();
@@ -108,7 +108,7 @@ namespace armarx::armem
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
// Properties
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
index 82a365295..fcf303e7b 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
@@ -8,7 +8,7 @@
namespace armarx::armem
{
- MappingDataWriter::MappingDataWriter(const armem::client::MemoryNameSystem& memoryNameSystem)
+ MappingDataWriter::MappingDataWriter(armem::client::MemoryNameSystem& memoryNameSystem)
: memoryNameSystem(memoryNameSystem) {}
MappingDataWriter::~MappingDataWriter() = default;
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h
index c7d8ba577..ab4187ada 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h
@@ -50,7 +50,7 @@ namespace armarx::armem
{
public:
- MappingDataWriter(const armem::client::MemoryNameSystem& memoryNameSystem);
+ MappingDataWriter(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~MappingDataWriter();
void connect();
@@ -65,7 +65,7 @@ namespace armarx::armem
bool storeSensorData(const LaserScan& laserScan, const std::string& frame, const std::string& agentName, const std::int64_t& timestamp);
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
// Properties
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
index 07fa4333c..7565a6aa2 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
@@ -22,7 +22,7 @@ namespace fs = ::std::filesystem;
namespace armarx::armem::robot_state
{
- RobotReader::RobotReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ RobotReader::RobotReader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem), transformReader(memoryNameSystem)
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
index 9847996cd..13b5572d3 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
@@ -44,7 +44,7 @@ namespace armarx::armem::robot_state
class RobotReader : virtual public robot::ReaderInterface
{
public:
- RobotReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ RobotReader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~RobotReader() = default;
void connect();
@@ -90,7 +90,7 @@ namespace armarx::armem::robot_state
const std::string propertyPrefix = "mem.robot_state.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
index a59d7c656..10e13611f 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
@@ -14,7 +14,7 @@
namespace armarx::armem::robot_state
{
- VirtualRobotReader::VirtualRobotReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ VirtualRobotReader::VirtualRobotReader(armem::client::MemoryNameSystem& memoryNameSystem) :
RobotReader(memoryNameSystem)
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
index 373cacf7b..e5945103c 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
@@ -41,7 +41,7 @@ namespace armarx::armem::robot_state
class VirtualRobotReader : virtual public RobotReader
{
public:
- VirtualRobotReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ VirtualRobotReader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~VirtualRobotReader() = default;
void connect();
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
index cdbfc5a36..6aa026431 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
@@ -62,7 +62,7 @@
namespace armarx::armem::client::robot_state::localization
{
- TransformReader::TransformReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ TransformReader::TransformReader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem) {}
TransformReader::~TransformReader() = default;
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h
index 14186e551..516769871 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h
@@ -44,7 +44,7 @@ namespace armarx::armem::client::robot_state::localization
virtual public TransformReaderInterface
{
public:
- TransformReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ TransformReader(armem::client::MemoryNameSystem& memoryNameSystem);
~TransformReader() override;
@@ -60,7 +60,7 @@ namespace armarx::armem::client::robot_state::localization
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
// Properties
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp
index 87f9ac31d..47660fc43 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp
@@ -54,7 +54,7 @@
namespace armarx::armem::client::robot_state::localization
{
- TransformWriter::TransformWriter(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ TransformWriter::TransformWriter(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem) {}
TransformWriter::~TransformWriter() = default;
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h
index d0895f3b8..f69ab33f2 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h
@@ -49,7 +49,7 @@ namespace armarx::armem::client::robot_state::localization
{
public:
- TransformWriter(const armem::client::MemoryNameSystem& memoryNameSystem);
+ TransformWriter(armem::client::MemoryNameSystem& memoryNameSystem);
~TransformWriter() override;
// TransformWriterInterface
@@ -63,7 +63,7 @@ namespace armarx::armem::client::robot_state::localization
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
std::mutex memoryWriterMutex;
--
GitLab