diff --git a/libs/bsw/util/CMakeLists.txt b/libs/bsw/util/CMakeLists.txt index 65972c75256..a66ebf005c1 100644 --- a/libs/bsw/util/CMakeLists.txt +++ b/libs/bsw/util/CMakeLists.txt @@ -1,7 +1,6 @@ add_library( util src/util/estd/assert.cpp - src/util/logger/StderrLogger.cpp src/util/logger/ComponentInfo.cpp src/util/logger/Logger.cpp src/util/logger/LevelInfo.cpp diff --git a/libs/bsw/util/include/util/logger/StderrLogger.h b/libs/bsw/util/include/util/logger/StderrLogger.h deleted file mode 100644 index de6a511e47b..00000000000 --- a/libs/bsw/util/include/util/logger/StderrLogger.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2024 Accenture. - -#pragma once - -#include -#include - -namespace util -{ -namespace logger -{ -class LoggerComponentInfo -{ -public: - LoggerComponentInfo(uint8_t& component, char const* name, Level level); - - uint8_t& getComponent(); - ComponentInfo getComponentInfo() const; - Level getLevel() const; - -private: - uint8_t& _component; - Level _level; - ComponentInfo::PlainInfo _componentInfo; -}; - -class StderrLogger -: private IComponentMapping -, private ILoggerOutput -{ -public: - template - StderrLogger(LoggerComponentInfo (&firstComponentInfo)[Count]); - ~StderrLogger(); - - static void init(); - static void shutdown(); - - bool isEnabled(uint8_t componentIndex, Level level) const override; - Level getLevel(uint8_t componentIndex) const override; - LevelInfo getLevelInfo(Level level) const override; - ComponentInfo getComponentInfo(uint8_t componentIndex) const override; - - void logOutput( - ComponentInfo const& componentInfo, - LevelInfo const& levelInfo, - char const* str, - va_list ap) override; - -private: - void applyMapping(); - void clearMapping(); - - LoggerComponentInfo* _firstComponent; - uint8_t _count; - StderrLogger* _prevInstance; - - static StderrLogger* _instance; -}; - -class TestLoggingGuard -{ -public: - TestLoggingGuard(); - ~TestLoggingGuard(); -}; - -template -StderrLogger::StderrLogger(LoggerComponentInfo (&firstComponentInfo)[Count]) -: _firstComponent(firstComponentInfo), _count(Count), _prevInstance(_instance) -{ - _instance = this; -} - -} // namespace logger -} // namespace util diff --git a/libs/bsw/util/src/util/logger/StderrLogger.cpp b/libs/bsw/util/src/util/logger/StderrLogger.cpp deleted file mode 100644 index c696d62ff80..00000000000 --- a/libs/bsw/util/src/util/logger/StderrLogger.cpp +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright 2024 Accenture. - -#include "util/logger/StderrLogger.h" - -#include "util/logger/Logger.h" - -#include -#include - -namespace util -{ -namespace logger -{ -StderrLogger* StderrLogger::_instance = nullptr; - -StderrLogger::~StderrLogger() -{ - if (_instance == this) - { - _instance = _prevInstance; - } -} - -void StderrLogger::init() -{ - if (_instance != nullptr) - { - _instance->applyMapping(); - Logger::init(*_instance, *_instance); - } -} - -void StderrLogger::shutdown() -{ - if (_instance != nullptr) - { - Logger::shutdown(); - _instance->clearMapping(); - } -} - -bool StderrLogger::isEnabled(uint8_t componentIndex, Level level) const -{ - return componentIndex < _count && level >= _firstComponent[componentIndex].getLevel(); -} - -Level StderrLogger::getLevel(uint8_t componentIndex) const -{ - return componentIndex < _count ? _firstComponent[componentIndex].getLevel() : LEVEL_NONE; -} - -LevelInfo StderrLogger::getLevelInfo(Level level) const -{ - return LevelInfo(LevelInfo::getDefaultTable() + level); -} - -ComponentInfo StderrLogger::getComponentInfo(uint8_t componentIndex) const -{ - return componentIndex < _count ? _firstComponent[componentIndex].getComponentInfo() - : ComponentInfo(); -} - -void StderrLogger::logOutput( - ComponentInfo const& componentInfo, LevelInfo const& levelInfo, char const* str, va_list ap) -{ - fprintf( - stderr, "%s: %s: ", componentInfo.getName().getString(), levelInfo.getName().getString()); - vfprintf(stderr, str, ap); - fprintf(stderr, "\n"); -} - -void StderrLogger::applyMapping() -{ - for (uint8_t idx = 0; idx < _count; ++idx) - { - _firstComponent[idx].getComponent() = idx; - } -} - -void StderrLogger::clearMapping() -{ - for (uint8_t idx = 0; idx < _count; ++idx) - { - _firstComponent[idx].getComponent() = COMPONENT_NONE; - } -} - -TestLoggingGuard::TestLoggingGuard() { StderrLogger::init(); } - -TestLoggingGuard::~TestLoggingGuard() { StderrLogger::shutdown(); } - -LoggerComponentInfo::LoggerComponentInfo(uint8_t& component, char const* name, Level level) -: _component(component), _level(level) -{ - _componentInfo._nameInfo._string = name; - _componentInfo._nameInfo._attributes = ::util::format::StringAttributes().getAttributes(); -} - -uint8_t& LoggerComponentInfo::getComponent() { return _component; } - -ComponentInfo LoggerComponentInfo::getComponentInfo() const -{ - return ComponentInfo(_component, &_componentInfo); -} - -Level LoggerComponentInfo::getLevel() const { return _level; } - -} /* namespace logger */ -} /* namespace util */