Skip to content
Snippets Groups Projects

Minor fixes and improvements in skills

Merged Rainer Kartmann requested to merge skills/fixes into master
6 files
+ 57
41
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -17,21 +17,25 @@ namespace armarx::armem::client::util
const std::string prefix = propertyPrefix();
props = defaultProperties();
if (not props.has_value())
{
props = defaultProperties();
}
def->optional(props.memoryName, prefix + "Memory");
def->optional(props.coreSegmentName, prefix + "CoreSegment");
def->optional(props->memoryName, prefix + "Memory");
def->optional(props->coreSegmentName, prefix + "CoreSegment");
}
void
SimpleReaderBase::connect(armarx::armem::client::MemoryNameSystem& mns)
{
// Wait for the memory to become available and add it as dependency.
ARMARX_IMPORTANT << "SimpleReaderBase: Waiting for memory '" << props.memoryName << "' ...";
ARMARX_IMPORTANT << "SimpleReaderBase: Waiting for memory '" << properties().memoryName
<< "' ...";
try
{
memoryReaderClient = mns.useReader(MemoryID().withMemoryName(props.memoryName));
ARMARX_IMPORTANT << "SimpleReaderBase: Connected to memory '" << props.memoryName
memoryReaderClient = mns.useReader(MemoryID().withMemoryName(properties().memoryName));
ARMARX_IMPORTANT << "SimpleReaderBase: Connected to memory '" << properties().memoryName
<< "'";
}
catch (const armem::error::CouldNotResolveMemoryServer& e)
@@ -41,12 +45,6 @@ namespace armarx::armem::client::util
}
}
std::mutex&
SimpleReaderBase::memoryReaderMutex()
{
return memoryMutex;
}
const armem::client::Reader&
SimpleReaderBase::memoryReader() const
{
@@ -56,7 +54,17 @@ namespace armarx::armem::client::util
const SimpleReaderBase::Properties&
SimpleReaderBase::properties() const
{
return props;
if (not props.has_value())
{
const_cast<std::optional<Properties>&>(props) = defaultProperties();
}
return props.value();
}
void
SimpleReaderBase::setProperties(const Properties& p)
{
props = p;
}
} // namespace armarx::armem::client::util
Loading