Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

villas/memory: make MemoryBlock use shared_ptr instead of unique_ptr

Browse source 
Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
This commit is contained in:
Niklas Eiling 2022-12-19 17:01:44 +01:00 • committed by Steffen Vogel
parent 6fac4e583b
commit 2fa210f954
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/include/villas/memory.hpp
View file

@ -76,6 +76,12 @@ public:
memoryBlock(std::move(mem))
{ }
// Take ownership of the MemoryBlock
MemoryAccessor(std::shared_ptr<MemoryBlock> mem) :
translation(MemoryManager::get().getTranslationFromProcess(mem->getAddrSpaceId())),
memoryBlock(std::move(mem))
{ }
// Just act as an accessor, do not take ownership of MemoryBlock
MemoryAccessor(const MemoryBlock &mem) :
translation(MemoryManager::get().getTranslationFromProcess(mem.getAddrSpaceId()))
@ -106,10 +112,10 @@ public:
return reinterpret_cast<T*>(translation.getLocalAddr(0));
}
const MemoryBlock&
const std::shared_ptr<MemoryBlock>
getMemoryBlock() const
{
if (not memoryBlock) throw std::bad_alloc(); else return *memoryBlock;
if (not memoryBlock) throw std::bad_alloc(); else return memoryBlock;
}
private:
@ -117,7 +123,7 @@ private:
MemoryTranslation translation;
// Take the unique pointer in case user wants this class to have ownership
std::unique_ptr<MemoryBlock, MemoryBlock::deallocator_fn> memoryBlock;
std::shared_ptr<MemoryBlock> memoryBlock;
};
/**