The live rugnux run wrote its whole processing log into the broker's journal - every
[Rugnux] line of the library (tables included) plus a "rugnux:" line per step and note -
about 300 lines per collection, all of them results the user already gets through
/rugnux/status, the end message and the written files.
- Logger::ServiceLevel(service, level): every Logger of that name made afterwards keeps only
that level and above. The library makes its own Logger("Rugnux") (and
Logger("ScaleOnTheFly")) wherever it logs, so this is the one switch: the broker sets them
to error, or to debug with the existing `verbose` setting. The per-Logger "Version" line goes
with it. The rugnux CLI routes every Logger to its own sinks (RouteAll) and never calls
this, so its console and _log.txt are unchanged.
- The live observer feeds steps and notes to the live status only.
- The run's outcome is one line at the end: state, START -> first image and frame rate,
done after the last image, last image -> all written. The probe result, the warm-up time
and the cut reason go to debug (the cut is in the outcome line).
- Per-collection step chatter goes to debug: receiver init/teardown, thread start/stop,
"Wait for receiver done" and friends, the per-image mean processing time. The JFJochBroker
logger now follows `verbose` too, so these are available again with it.
- Kept: Start request, measurement start, receiving started/finished, receiver efficiency
(and the per-module packet counts on loss), calibration sequence, all warnings and errors.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PXc1zD1yxHqaR1DGdCTHL4
109 lines
4.3 KiB
C++
109 lines
4.3 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <chrono>
|
|
#include <iostream>
|
|
#include <mutex>
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include <spdlog/spdlog.h>
|
|
#include <spdlog/fmt/fmt.h>
|
|
|
|
namespace spdlog {
|
|
class logger;
|
|
}
|
|
|
|
class LogBufferSink;
|
|
|
|
class Logger {
|
|
std::shared_ptr<spdlog::logger> spdlog_logger;
|
|
std::shared_ptr<LogBufferSink> buffer; // only on a Buffered() logger
|
|
explicit Logger(std::shared_ptr<LogBufferSink> sink);
|
|
|
|
std::string service;
|
|
std::string hostname;
|
|
public:
|
|
Logger(const std::string &service_name, const std::string &file_name = "");
|
|
void ErrorException(const std::exception &e);
|
|
|
|
void Info(const std::string& msg) { spdlog_logger->info(msg); }
|
|
void Warning(const std::string& msg) { spdlog_logger->warn(msg); }
|
|
void Error(const std::string& msg) { spdlog_logger->error(msg); }
|
|
void Debug(const std::string& msg) { spdlog_logger->debug(msg); }
|
|
|
|
template<typename... Args>
|
|
void Info(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->info(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
template<typename... Args>
|
|
void Error(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->error(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
template<typename... Args>
|
|
void Debug(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->debug(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
template<typename... Args>
|
|
void Warning(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->warn(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
Logger& Verbose(bool input);
|
|
|
|
// Every Logger made after this call writes to `sink` alone instead of the console, keeps every
|
|
// level down to debug (the sink decides what it shows), and skips the version line each Logger
|
|
// otherwise opens with. For a program that owns its terminal: rugnux sends the whole log to a file
|
|
// next to its outputs and shows only warnings and errors among its own step lines.
|
|
static void RouteAll(spdlog::sink_ptr sink);
|
|
|
|
// Every Logger named `service` made after this call keeps only lines of `level` and above. For a program
|
|
// that runs a library whose log is not its own: the broker keeps rugnux's processing log out of its
|
|
// journal. Set at start-up, before any thread logs.
|
|
static void ServiceLevel(const std::string &service, spdlog::level::level_enum level);
|
|
|
|
// A logger that keeps its lines instead of printing them, for work run beside other work that
|
|
// logs: ReplayInto hands them to `to` afterwards, in order and as one block, so the two do not
|
|
// interleave.
|
|
static Logger Buffered();
|
|
void ReplayInto(Logger &to) const;
|
|
};
|
|
|
|
// An NVTX range named `name`, so a timed section shows up by name in an Nsight Systems trace. A start/end
|
|
// pair, not a push/pop, so a range may end on another thread and ranges on parallel threads may overlap.
|
|
// Without a profiler attached both calls return at once; without CUDA they do nothing.
|
|
uint64_t NvtxRangeStart(const std::string &name);
|
|
void NvtxRangeEnd(uint64_t id);
|
|
|
|
// Times one section of a run: logs "TIMING <section> <seconds>" at debug level when the section ends -
|
|
// at Stop(), or when the mark goes out of scope, whichever comes first. rugnux keeps debug lines off the
|
|
// terminal and in <prefix>_log.txt; tools/rugnux_timing.py turns them into a table. The section is also
|
|
// an NVTX range of the same name.
|
|
class TimingMark {
|
|
Logger &logger;
|
|
std::string section;
|
|
std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
|
|
uint64_t nvtx_range = NvtxRangeStart(section);
|
|
bool stopped = false;
|
|
public:
|
|
TimingMark(Logger &in_logger, std::string in_section)
|
|
: logger(in_logger), section(std::move(in_section)) {}
|
|
TimingMark(const TimingMark &) = delete;
|
|
TimingMark &operator=(const TimingMark &) = delete;
|
|
~TimingMark() { Stop(); }
|
|
void Stop() {
|
|
if (stopped)
|
|
return;
|
|
stopped = true;
|
|
NvtxRangeEnd(nvtx_range);
|
|
logger.Debug("TIMING {} {:.3f}", section,
|
|
std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count());
|
|
}
|
|
};
|