Skip to content
Snippets Groups Projects
Commit af0341c3 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Update include to ComponentPlugin.h

parent 13731bc4
No related branches found
No related tags found
2 merge requests!185Clean up interfaces and unneeded code in memory core classes,!178Draft: Make RobotStateMemory ready
#include "ComponentPlugin.h"
#include <ArmarXCore/core/Component.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <RobotAPI/libraries/armem/core/error.h>
......@@ -11,8 +12,7 @@
namespace armarx::armem::server::plugins
{
ComponentPlugin::~ComponentPlugin()
{}
ComponentPlugin::~ComponentPlugin() = default;
void ComponentPlugin::postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties)
......@@ -118,6 +118,8 @@ namespace armarx::armem::server
addPlugin(plugin);
}
ComponentPluginUser::~ComponentPluginUser() = default;
// WRITING
data::AddSegmentsResult ComponentPluginUser::addSegments(const data::AddSegmentsInput& input, const Ice::Current&)
......@@ -148,7 +150,8 @@ namespace armarx::armem::server
return iceMemory.query(input);
}
// LTM LOADING
// LTM STORING
data::StoreResult ComponentPluginUser::store(const data::StoreInput& input, const Ice::Current&)
{
std::scoped_lock lock(workingMemoryMutex, longtermMemoryMutex);
......@@ -156,7 +159,7 @@ namespace armarx::armem::server
}
// LTM STORING
// LTM LOADING
armem::query::data::Result ComponentPluginUser::load(const armem::query::data::Input& input, const Ice::Current&)
{
std::scoped_lock lock(longtermMemoryMutex);
......
......@@ -2,7 +2,7 @@
#include <mutex>
#include <ArmarXCore/core/Component.h>
#include <ArmarXCore/core/ComponentPlugin.h>
#include <RobotAPI/interface/armem/server/MemoryInterface.h>
#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
......@@ -73,7 +73,7 @@ namespace armarx::armem::server
public:
ComponentPluginUser();
virtual ~ComponentPluginUser() override = default;
virtual ~ComponentPluginUser() override;
// WritingInterface interface
......@@ -96,6 +96,7 @@ namespace armarx::armem::server
public:
/// The actual memory.
wm::Memory workingMemory;
std::mutex workingMemoryMutex;
......@@ -112,6 +113,7 @@ namespace armarx::armem::server
private:
plugins::ComponentPlugin* plugin = nullptr;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment