Commit 2affde11 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

use new getter for graph

parent 2a62ea92
......@@ -454,7 +454,7 @@ bool Gpu::init()
{
auto& mm = MemoryManager::get();
const auto gpuPciEAddrSpaceName = mm.getMasterAddrSpaceName(getName(), "PCIe");
const auto gpuPciEAddrSpaceName = mm.getMasterAddrSpaceName(getName(), "pcie");
masterPciEAddrSpaceId = mm.getOrCreateAddressSpace(gpuPciEAddrSpaceName);
allocator = std::make_unique<GpuAllocator>(*this);
......
......@@ -118,6 +118,10 @@ public:
virtual const StreamVertex&
getDefaultMasterPort() const;
const StreamGraph&
getGraph() const
{ return streamGraph; }
bool loopbackPossible() const;
bool connectLoopback();
......
......@@ -119,7 +119,7 @@ PCIeCardFactory::create()
PCIeCard::~PCIeCard()
{
auto& mm = MemoryManager::get();
auto& mg = MemoryManager::get().getGraph();
// unmap all memory blocks
for (auto& mappedMemoryBlock : memoryBlocksMapped) {
......
......@@ -175,7 +175,7 @@ int main(int argc, char* argv[])
dma->makeAccesibleFromVA(block);
auto &mm = MemoryManager::get();
mm.getMemoryGraph().dump("graph.dot");
mm.getGraph().dump("graph.dot");
while (true) {
dma->read(block, block.getSize());
......
......@@ -100,7 +100,8 @@ Test(fpga, dma, .description = "DMA")
logger->info(CLR_GRN("Passed"));
}
MemoryManager::get().dump();
cr_assert(count > 0, "No DMA found");
cr_assert(count > 0, "No Dma found");
MemoryManager::getGraph().dump();
IpNode::getGraph().dump();
}
......@@ -142,7 +142,7 @@ Test(fpga, gpu_dma, .description = "GPU DMA tests")
CLR_RED("Failed"));
}
villas::MemoryManager::get().dump();
MemoryManager::getGraph().dump();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment