From 977b65ae2d964e01911febfbbb7ae00a71c6d2c0 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 24 Feb 2022 07:31:54 -0500 Subject: [PATCH] improve log output for signal lists --- lib/hook_list.cpp | 3 ++- lib/nodes/signal.cpp | 3 ++- lib/path.cpp | 3 ++- lib/sample.cpp | 2 +- lib/signal_list.cpp | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/hook_list.cpp b/lib/hook_list.cpp index f1929e947..cc140af11 100644 --- a/lib/hook_list.cpp +++ b/lib/hook_list.cpp @@ -110,7 +110,8 @@ skip_add: auto logger = h->getLogger(); logger->debug("Signal list after hook #{}:", i++); - sigs->dump(logger); + if (logger->level() <= spdlog::level::debug) + sigs->dump(logger); } } diff --git a/lib/nodes/signal.cpp b/lib/nodes/signal.cpp index 82beea6c0..f93a50bf0 100644 --- a/lib/nodes/signal.cpp +++ b/lib/nodes/signal.cpp @@ -224,7 +224,8 @@ int SignalNode::prepare() sig = ssig.toSignal(sig); } - in.signals->dump(logger); + if (logger->level() <= spdlog::level::debug) + in.signals->dump(logger); return Node::prepare(); } diff --git a/lib/path.cpp b/lib/path.cpp index 6bbcf64c5..bec536847 100644 --- a/lib/path.cpp +++ b/lib/path.cpp @@ -343,7 +343,8 @@ void Path::prepare(NodeList &nodes) throw RuntimeError("Failed to initialize pool of path: {}", *this); logger->debug("Prepared path {} with {} output signals:", *this, osigs->size()); - osigs->dump(logger); + if (logger->level() <= spdlog::level::debug) + osigs->dump(logger); checkPrepared(); diff --git a/lib/sample.cpp b/lib/sample.cpp index cb474a923..82eea9e28 100644 --- a/lib/sample.cpp +++ b/lib/sample.cpp @@ -299,7 +299,7 @@ void villas::node::sample_dump(Logger logger, struct Sample *s) { logger->info("Sample: sequence={}, length={}, capacity={}," "flags={:#x}, #signals={}, " - "refcnt={}, pool_off={}", + "refcnt={}, pool_off={:#x}", s->sequence, s->length, s->capacity, diff --git a/lib/signal_list.cpp b/lib/signal_list.cpp index 9b3dfda12..3cc6a03f2 100644 --- a/lib/signal_list.cpp +++ b/lib/signal_list.cpp @@ -121,7 +121,7 @@ void SignalList::dump(Logger logger, const union SignalData *data, unsigned len) else pfx = " "; - logger->debug(" {}{:>3}: {}", pfx, i, sig->toString(i < len ? &data[i] : nullptr)); + logger->info(" {}{:>3}: {}", pfx, i, sig->toString(i < len ? &data[i] : nullptr)); skip: prevSig = sig; i++;