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

fix throwing an error in villas-fpga-cat leading to abort, because of wrong deconstructor order

Browse source 
Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
This commit is contained in:
Niklas Eiling 2022-12-02 13:31:03 +01:00
parent f26656a90d
commit 404bc9c8be
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fpga/common

@ -1 +1 @@
Subproject commit b7e176fdb69025a2bdb9fa27efa7d3b524a905cd
Subproject commit 8dcf83bf0fbc258bb54db2434df796255119213f

17
fpga/src/villas-fpga-cat.cpp
View file

@ -72,6 +72,13 @@ int main(int argc, char* argv[])
return 1;
}
//FIXME: This must be called before card is intialized, because the card descructor
// still accesses the allocated memory. This order ensures that the allocator
// is destroyed AFTER the card.
auto &alloc = villas::HostRam::getAllocator();
villas::MemoryAccessor<int32_t> mem[] = {alloc.allocate<int32_t>(0x200), alloc.allocate<int32_t>(0x200)};
const villas::MemoryBlock block[] = {mem[0].getMemoryBlock(), mem[1].getMemoryBlock()};
auto card = fpga::setupFpgaCard(configFile, fpgaName);
std::vector<fpga::ip::AuroraXilinx::Ptr> aurora_channels;
@ -104,10 +111,6 @@ int main(int argc, char* argv[])
#else
dma->connectLoopback();
#endif
auto &alloc = villas::HostRam::getAllocator();
villas::MemoryAccessor<int32_t> mem[] = {alloc.allocate<int32_t>(0x200), alloc.allocate<int32_t>(0x200)};
const villas::MemoryBlock block[] = {mem[0].getMemoryBlock(), mem[1].getMemoryBlock()};
for (auto b : block) {
dma->makeAccesibleFromVA(b);
}
@ -152,6 +155,12 @@ int main(int argc, char* argv[])
return -1;
} catch (const CLI::ParseError &e) {
return app.exit(e);
} catch (const std::exception &e) {
logger->error("Error: {}", e.what());
return -1;
} catch (...) {
logger->error("Unknown error");
return -1;
}
return 0;