From 44e78643ea08fbf683b857234191236609b757f7 Mon Sep 17 00:00:00 2001 From: daniel-k Date: Wed, 10 Jan 2018 15:43:36 +0100 Subject: [PATCH] lib/log: purge remaining of old logger --- fpga/include/villas/log.hpp | 107 ------------------------------------ fpga/lib/CMakeLists.txt | 1 - fpga/lib/log.cpp | 26 --------- 3 files changed, 134 deletions(-) delete mode 100644 fpga/lib/log.cpp diff --git a/fpga/include/villas/log.hpp b/fpga/include/villas/log.hpp index 83244395f..8a7a84bad 100644 --- a/fpga/include/villas/log.hpp +++ b/fpga/include/villas/log.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include #define SPDLOG_LEVEL_NAMES { "trace", "debug", "info ", "warn ", "error", "crit ", "off " } @@ -22,109 +21,3 @@ inline SpdLogger loggerGetOrCreate(const std::string& logger_name) } return logger; } - - - -class LoggerIndent; - -class Logger { - friend LoggerIndent; -public: - - enum class LogLevel : int { - Debug, - Info, - Warning, - Error, - Disabled - }; - - class LoggerNewline { - public: - LoggerNewline(bool enabled = true) : enabled(enabled) {} - ~LoggerNewline() { - if(enabled) - std::cout << std::endl; - } - template - LoggerNewline& operator<< (T const& value) { - if(enabled) - std::cout << value; - return *this; - } - bool enabled; - }; - - class Indenter { - public: - Indenter(Logger* l) : logger(l) - { logger->increaseIndention(); } - - ~Indenter() - { logger->decreaseIndention(); } - private: - Logger* logger; - }; - - Logger(LogLevel level, std::string prefix = "") : level(level), prefix(prefix) {} - - Indenter indent() - { return Indenter(this); } - - static std::string - getPadding() - { - std::string out = ""; - for(int i = 0; i < depthCurrent; i++) out.append("\u2551 "); - return out; - } - - template - LoggerNewline operator<< (T const& value) { - if(level >= global_level) { - - if(depth > depthCurrent) { - std::cout << Logger::getPadding() << "\u255f\u2500\u2556" << std::endl; - depthCurrent++; - } - std::cout << Logger::getPadding() << "\u255f " << prefix << value; - return LoggerNewline(); - } else { - return LoggerNewline(false); - } - } - - - void - increaseIndention() - { - depth++; - } - - void - decreaseIndention() - { - if(depth == depthCurrent) - std::cout << Logger::getPadding() << std::endl; - - depthCurrent = --depth; - } - - static - void - setLogLevel(LogLevel level) - { global_level = level; } - -private: - LogLevel level; - std::string prefix; - static int depth; - static LogLevel global_level; - static int depthCurrent; -}; - - -extern Logger cpp_debug; -extern Logger cpp_info; -extern Logger cpp_warn; -extern Logger cpp_error; diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt index db8b7f023..62cff3113 100644 --- a/fpga/lib/CMakeLists.txt +++ b/fpga/lib/CMakeLists.txt @@ -33,7 +33,6 @@ set(SOURCES log.c log_config.c log_helper.c - log.cpp ) include(FindPkgConfig) diff --git a/fpga/lib/log.cpp b/fpga/lib/log.cpp deleted file mode 100644 index a16ebc375..000000000 --- a/fpga/lib/log.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "log.hpp" -#include "utils.h" - -int Logger::depth; -int Logger::depthCurrent; -Logger::LogLevel Logger::global_level = Logger::LogLevel::Info; - -Logger cpp_debug(Logger::LogLevel::Debug, "" CLR_BLU(" Debug ") "| "); -Logger cpp_info(Logger::LogLevel::Info); -Logger cpp_warn(Logger::LogLevel::Warning, "" CLR_YEL("Warning") "| "); -Logger cpp_error(Logger::LogLevel::Error, "" CLR_RED(" Error ") "| "); - -void test() -{ - cpp_debug << "Hello"; - { - Logger::Indenter indent = cpp_debug.indent(); - cpp_debug << "indented"; - { - Logger::Indenter indent = cpp_debug.indent(); - cpp_debug << "indented"; - } - } - - cpp_debug << "and root again"; -}