From a0fc73f2eec1e874688ab5416e7a9c40ab8f00a0 Mon Sep 17 00:00:00 2001 From: Niklas Eiling Date: Wed, 7 Feb 2024 15:16:36 +0100 Subject: [PATCH] villas-fpga-ctrl: return to old loggers Signed-off-by: Niklas Eiling --- fpga/src/villas-fpga-ctrl.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fpga/src/villas-fpga-ctrl.cpp b/fpga/src/villas-fpga-ctrl.cpp index c6abee39c..ad803a06e 100644 --- a/fpga/src/villas-fpga-ctrl.cpp +++ b/fpga/src/villas-fpga-ctrl.cpp @@ -141,17 +141,18 @@ void readFromDmaToStdOut( int cnt = 0; while (true) { - SPDLOG_TRACE("Read from stream and write to address {}:{:#x}", - block[next]->getAddrSpaceId(), block[next]->getOffset()); + logger->trace("Read from stream and write to address {}:{:#x}", + block[next]->getAddrSpaceId(), block[next]->getOffset()); // We could use the number of interrupts to determine if we missed a chunk of data dma->read(*block[next], block[next]->getSize()); auto c = dma->readComplete(); if (c.interrupts > 1) { - SPDLOG_WARN("Missed {} interrupts", c.interrupts - 1); + logger->warn("Missed {} interrupts", c.interrupts - 1); } - SPDLOG_TRACE("bytes: {}, intrs: {}, bds: {}", c.bytes, c.interrupts, c.bds); + logger->trace("bytes: {}, intrs: {}, bds: {}", c.bytes, c.interrupts, + c.bds); try { for (size_t i = 0; i * 4 < c.bytes; i++) { int32_t ival = mem[cur][i]; @@ -165,7 +166,7 @@ void readFromDmaToStdOut( } formatter->output(std::cout); } catch (const std::exception &e) { - SPDLOG_WARN("Failed to output data: {}", e.what()); + logger->warn("Failed to output data: {}", e.what()); } cur = next; @@ -204,6 +205,7 @@ int main(int argc, char *argv[]) { // Logging setup logging.setLevel(spdlog::level::trace); + logger->set_level(spdlog::level::trace); fpga::setupColorHandling(); if (configFile.empty()) {