From 4dc749b2d12f5dd0a059afac116877d4664f9868 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 10 Jun 2021 08:51:18 +0200
Subject: [PATCH] simple reader and writer: minor fixes
---
.../armem/client/util/SimpleReaderBase.cpp | 15 ++++++++-------
.../armem/client/util/SimpleReaderBase.h | 6 +-----
.../armem/client/util/SimpleWriterBase.h | 10 +++-------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp b/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp
index 4a6ba069e..6c3afb9a2 100644
--- a/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp
+++ b/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp
@@ -4,13 +4,13 @@
namespace armarx::armem::client::util
{
- SimpleReaderBase::SimpleReaderBase(ComponentPluginUser& component) :
- component(component)
+ SimpleReaderBase::SimpleReaderBase(ComponentPluginUser& memoryClient) :
+ component(memoryClient)
{
}
- void
- SimpleReaderBase::registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def)
+ void SimpleReaderBase::registerPropertyDefinitions(
+ armarx::PropertyDefinitionsPtr& def)
{
ARMARX_DEBUG << "Writer: registerPropertyDefinitions";
@@ -23,8 +23,8 @@ namespace armarx::armem::client::util
void SimpleReaderBase::connect()
{
// Wait for the memory to become available and add it as dependency.
- ARMARX_IMPORTANT << "Writer: Waiting for memory '"
- << props.memoryName << "' ...";
+ ARMARX_IMPORTANT << "Writer: Waiting for memory '" << props.memoryName
+ << "' ...";
auto result = component.useMemory(props.memoryName);
if (not result.success)
{
@@ -43,10 +43,11 @@ namespace armarx::armem::client::util
return memoryMutex;
}
- armem::client::Reader& SimpleReaderBase::memoryReader()
+ const armem::client::Reader& SimpleReaderBase::memoryReader() const
{
return memoryReaderClient;
}
+
const SimpleReaderBase::Properties& SimpleReaderBase::properties() const
{
return props;
diff --git a/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h b/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h
index 8503cda61..4e2c8edf2 100644
--- a/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h
+++ b/source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h
@@ -27,10 +27,6 @@
#include "RobotAPI/libraries/armem/client/Reader.h"
-namespace armarx::armem
-{
- class ClientComponentPluginUser;
-}
namespace armarx::armem::client
{
@@ -63,7 +59,7 @@ namespace armarx::armem::client::util
virtual Properties defaultProperties() const = 0;
std::mutex& memoryReaderMutex();
- armem::client::Reader& memoryReader();
+ const armem::client::Reader& memoryReader() const;
private:
Properties props;
diff --git a/source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h b/source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h
index 0d8436e42..55829b2c7 100644
--- a/source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h
+++ b/source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h
@@ -28,10 +28,6 @@
// #include "RobotAPI/libraries/armem/client/Reader.h"
#include "RobotAPI/libraries/armem/client/Writer.h"
-namespace armarx::armem
-{
- class ClientComponentPluginUser;
-}
namespace armarx::armem::client
{
@@ -43,14 +39,14 @@ namespace armarx::armem::client::util
class SimpleWriterBase
{
- public:
+ public:
SimpleWriterBase(ComponentPluginUser& component);
virtual ~SimpleWriterBase() = default;
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
void connect();
- protected:
+ protected:
std::mutex& memoryWriterMutex();
armem::client::Writer& memoryWriter();
@@ -66,7 +62,7 @@ namespace armarx::armem::client::util
virtual std::string propertyPrefix() const = 0;
virtual Properties defaultProperties() const = 0;
- private:
+ private:
Properties props;
armem::client::Writer memoryWriterClient;
--
GitLab