From c8f1562523cc947ea8809fbd8e5d1be97cfbcc94 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 10 Jun 2021 09:14:43 +0200
Subject: [PATCH] Update component plugins, revise function names
---
.../armem/client/ComponentPlugin.cpp | 12 +++----
.../libraries/armem/client/ComponentPlugin.h | 7 ++--
.../armem/client/ReaderComponentPlugin.cpp | 8 ++---
.../armem/client/ReaderComponentPlugin.h | 11 +++---
.../armem/client/WriterComponentPlugin.cpp | 8 ++---
.../armem/client/WriterComponentPlugin.h | 8 +++--
.../libraries/armem/mns/ClientPlugin.cpp | 35 ++++++++-----------
.../libraries/armem/mns/ClientPlugin.h | 12 +++----
8 files changed, 46 insertions(+), 55 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
index ba836f47f..3453ebefb 100644
--- a/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
@@ -21,20 +21,20 @@ armarx::armem::client::ComponentPluginUser::~ComponentPluginUser()
void
-armarx::armem::client::ComponentPluginUser::setMemory(server::MemoryInterfacePrx memory)
+armarx::armem::client::ComponentPluginUser::setMemoryServer(server::MemoryInterfacePrx memory)
{
- setReadingMemory(memory);
- setWritingMemory(memory);
+ setReadingMemoryServer(memory);
+ setWritingMemoryServer(memory);
}
armarx::armem::data::WaitForMemoryResult
-armarx::armem::client::ComponentPluginUser::useMemory(const std::string& memoryName)
+armarx::armem::client::ComponentPluginUser::useMemoryServer(const std::string& memoryName)
{
- armem::data::WaitForMemoryResult result = mns::plugins::ClientPluginUserBase::useMemory(memoryName);
+ armem::data::WaitForMemoryResult result = mns::plugins::ClientPluginUserBase::useMemoryServer(memoryName);
if (result.proxy)
{
- setMemory(result.proxy);
+ setMemoryServer(result.proxy);
}
return result;
}
diff --git a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
index 7fc432536..6087f8bf0 100644
--- a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
@@ -34,12 +34,13 @@ namespace armarx::armem::client
* @return The result of `waitForMemory()`.
* @see `armem::mns::plugins::ClientPluginUserBase::useMemory()`
*/
- virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
- using mns::plugins::ClientPluginUserBase::useMemory;
+ virtual armem::data::WaitForMemoryResult useMemoryServer(const std::string& memoryName) override;
+ using mns::plugins::ClientPluginUserBase::useMemoryServer;
+
protected:
- void setMemory(server::MemoryInterfacePrx memory);
+ void setMemoryServer(server::MemoryInterfacePrx memory);
};
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
index 2e73e852b..4bfd84085 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
@@ -50,17 +50,17 @@ namespace armarx::armem::client
void
- ReaderComponentPluginUser::setReadingMemory(server::ReadingMemoryInterfacePrx memory)
+ ReaderComponentPluginUser::setReadingMemoryServer(server::ReadingMemoryInterfacePrx memory)
{
memoryReader.setReadingMemory(memory);
}
- armem::data::WaitForMemoryResult ReaderComponentPluginUser::useMemory(const std::string& memoryName)
+ armem::data::WaitForMemoryResult ReaderComponentPluginUser::useMemoryServer(const std::string& memoryName)
{
- armem::data::WaitForMemoryResult result = mns::plugins::ClientPluginUserBase::useMemory(memoryName);
+ armem::data::WaitForMemoryResult result = mns::plugins::ClientPluginUserBase::useMemoryServer(memoryName);
if (result.proxy)
{
- setReadingMemory(result.proxy);
+ setReadingMemoryServer(result.proxy);
}
return result;
}
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
index 8c7858bfc..61ee88e15 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
@@ -50,19 +50,16 @@ namespace armarx::armem::client
ReaderComponentPluginUser();
~ReaderComponentPluginUser() override;
- virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
- using mns::plugins::ClientPluginUserBase::useMemory;
+ virtual armem::data::WaitForMemoryResult useMemoryServer(const std::string& memoryName) override;
+ using mns::plugins::ClientPluginUserBase::useMemoryServer;
virtual void memoryUpdated(const std::vector<data::MemoryID>& updatedSnapshotIDs, const Ice::Current& current) override;
- protected:
-
- void setReadingMemory(server::ReadingMemoryInterfacePrx memory);
-
-
protected:
+ void setReadingMemoryServer(server::ReadingMemoryInterfacePrx memory);
+
Reader memoryReader;
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
index 04014c77a..a1ac7ace5 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
@@ -32,17 +32,17 @@ namespace armarx::armem::client
void
- WriterComponentPluginUser::setWritingMemory(server::WritingMemoryInterfacePrx memory)
+ WriterComponentPluginUser::setWritingMemoryServer(server::WritingMemoryInterfacePrx memory)
{
memoryWriter.setWritingMemory(memory);
}
- armem::data::WaitForMemoryResult WriterComponentPluginUser::useMemory(const std::string& memoryName)
+ armem::data::WaitForMemoryResult WriterComponentPluginUser::useMemoryServer(const std::string& memoryName)
{
- armem::data::WaitForMemoryResult result = mns::plugins::ClientPluginUserBase::useMemory(memoryName);
+ armem::data::WaitForMemoryResult result = mns::plugins::ClientPluginUserBase::useMemoryServer(memoryName);
if (result.proxy)
{
- setWritingMemory(result.proxy);
+ setWritingMemoryServer(result.proxy);
}
return result;
}
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
index 0f5f21f80..acb97b0d2 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
@@ -40,15 +40,17 @@ namespace armarx::armem::client
WriterComponentPluginUser();
~WriterComponentPluginUser() override;
- virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
- using mns::plugins::ClientPluginUserBase::useMemory;
+ virtual armem::data::WaitForMemoryResult useMemoryServer(const std::string& memoryName) override;
+ using mns::plugins::ClientPluginUserBase::useMemoryServer;
+
protected:
- void setWritingMemory(server::WritingMemoryInterfacePrx memory);
+ void setWritingMemoryServer(server::WritingMemoryInterfacePrx memory);
Writer memoryWriter;
+
private:
plugins::WriterComponentPlugin* plugin = nullptr;
diff --git a/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp b/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp
index 0fd8989be..4badf7a6e 100644
--- a/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp
@@ -44,7 +44,14 @@ namespace armarx::armem::mns::plugins
{
if (isMemoryNameSystemEnabled())
{
- parent<ClientPluginUserBase>().memoryNameSystem = mns::Client(getMemoryNameSystem());
+ if (ManagedIceObject* component = dynamic_cast<ManagedIceObject*>(this))
+ {
+ parent<ClientPluginUserBase>().memoryNameSystem = mns::Client(getMemoryNameSystem(), component);
+ }
+ else
+ {
+ parent<ClientPluginUserBase>().memoryNameSystem = mns::Client(getMemoryNameSystem());
+ }
}
}
@@ -73,20 +80,13 @@ namespace armarx::armem::mns::plugins
{
}
- armem::data::WaitForMemoryResult ClientPluginUserBase::useMemory(const MemoryID& id)
+ armem::data::WaitForMemoryResult ClientPluginUserBase::useMemoryServer(const MemoryID& id)
{
armem::data::WaitForMemoryResult result;
try
{
- if (ManagedIceObject* comp = dynamic_cast<ManagedIceObject*>(this))
- {
- // Add dependency.
- result.proxy = memoryNameSystem.useServer(id, *comp);
- }
- else
- {
- result.proxy = memoryNameSystem.waitForServer(id);
- }
+ // Add dependency.
+ result.proxy = memoryNameSystem.useServer(id);
result.success = true;
}
catch (const armem::error::CouldNotResolveMemoryServer& e)
@@ -97,12 +97,12 @@ namespace armarx::armem::mns::plugins
return result;
}
- armem::data::WaitForMemoryResult ClientPluginUserBase::useMemory(const std::string& memoryName)
+ armem::data::WaitForMemoryResult ClientPluginUserBase::useMemoryServer(const std::string& memoryName)
{
- return useMemory(MemoryID().withMemoryName(memoryName));
+ return useMemoryServer(MemoryID().withMemoryName(memoryName));
}
- armem::data::WaitForMemoryResult ClientPluginUserBase::waitForMemory(const std::string& memoryName)
+ armem::data::WaitForMemoryResult ClientPluginUserBase::waitForMemoryServer(const std::string& memoryName)
{
armem::data::WaitForMemoryResult result;
try
@@ -118,7 +118,7 @@ namespace armarx::armem::mns::plugins
return result;
}
- armem::data::ResolveMemoryNameResult ClientPluginUserBase::resolveMemoryName(const std::string& memoryName)
+ armem::data::ResolveMemoryNameResult ClientPluginUserBase::resolveMemoryServer(const std::string& memoryName)
{
armem::data::ResolveMemoryNameResult result;
try
@@ -134,10 +134,5 @@ namespace armarx::armem::mns::plugins
return result;
}
- bool ClientPluginUserBase::isMemoryAvailable(const std::string& memoryName)
- {
- return memoryNameSystem.resolveServer(MemoryID().withMemoryName(memoryName));
- }
-
}
diff --git a/source/RobotAPI/libraries/armem/mns/ClientPlugin.h b/source/RobotAPI/libraries/armem/mns/ClientPlugin.h
index dd9b5abad..1ea01e0eb 100644
--- a/source/RobotAPI/libraries/armem/mns/ClientPlugin.h
+++ b/source/RobotAPI/libraries/armem/mns/ClientPlugin.h
@@ -62,15 +62,11 @@ namespace armarx::armem::mns::plugins
virtual ~ClientPluginUserBase();
+ armem::data::WaitForMemoryResult waitForMemoryServer(const std::string& memoryName);
+ armem::data::ResolveMemoryNameResult resolveMemoryServer(const std::string& memoryName);
- armem::data::WaitForMemoryResult waitForMemory(const std::string& memoryName);
- armem::data::ResolveMemoryNameResult resolveMemoryName(const std::string& memoryName);
-
- [[deprecated("Use memoryNameSystem.resolveServer(MemoryID().withMemoryName(memoryName)) instead.")]]
- bool isMemoryAvailable(const std::string& memoryName);
-
- armem::data::WaitForMemoryResult useMemory(const MemoryID& id);
- virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName);
+ armem::data::WaitForMemoryResult useMemoryServer(const MemoryID& id);
+ virtual armem::data::WaitForMemoryResult useMemoryServer(const std::string& memoryName);
public:
--
GitLab