Update CI nodes

.github/workflows/ci.yml

@@ -1,85 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ master, dev ]
-  pull_request:
-    branches: [ master, dev ]
-
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        fedora: [38, 39, 40]
-        include:
-          - fedora: 38
-            gcc: 13
-          - fedora: 39
-            gcc: 13
-          - fedora: 40
-            gcc: 14
-
-    container: ghcr.io/fairrootgroup/fairmq-dev/fedora-${{ matrix.fedora }}
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install additional dependencies
-      run: |
-        dnf install -y fmt-devel || true
-
-    - name: Configure
-      run: |
-        cmake -B build -G Ninja \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DDISABLE_COLOR=ON \
-          -DUSE_EXTERNAL_FMT=ON \
-          -DUSE_BOOST_PRETTY_FUNCTION=ON
-
-    - name: Build
-      run: cmake --build build
-
-    - name: Test
-      run: |
-        cd build
-        ctest -V --output-on-failure
-
-  build-macos:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-13, macos-14, macos-15]
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Cache Homebrew packages
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/Library/Caches/Homebrew
-          /usr/local/Homebrew/Library/Taps
-        key: ${{ runner.os }}-${{ matrix.os }}-brew-${{ hashFiles('.github/workflows/ci.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.os }}-brew-
-
-    - name: Install dependencies
-      run: |
-        brew install cmake ninja boost fmt
-
-    - name: Configure
-      run: |
-        cmake -B build -G Ninja \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DDISABLE_COLOR=ON \
-          -DUSE_EXTERNAL_FMT=ON \
-          -DUSE_BOOST_PRETTY_FUNCTION=ON
-
-    - name: Build
-      run: cmake --build build
-
-    - name: Test
-      run: |
-        cd build
-        ctest -V --output-on-failure

.gitignore

@@ -1,3 +1,2 @@
 build/
 .vscode
-install/

CMakeLists.txt

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -7,7 +7,7 @@
 ################################################################################
 
 cmake_minimum_required(VERSION 3.9.4 FATAL_ERROR)
-cmake_policy(VERSION 3.9...3.30)
+cmake_policy(VERSION 3.9...3.19)
 
 # Project ######################################################################
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -16,7 +16,7 @@ include(FairFindPackage2)
 
 get_git_version()
 
-project(FairLogger VERSION ${PROJECT_VERSION} LANGUAGES CXX)
+project(FairLogger VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
 message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")
 
 set_fairlogger_defaults()
@@ -54,7 +54,7 @@ add_library(FairLogger
   logger/Logger.cxx
   logger/Logger.h
 )
-target_compile_features(FairLogger PUBLIC cxx_std_17)
+target_compile_features(FairLogger PUBLIC cxx_std_14)
 
 if(USE_BOOST_PRETTY_FUNCTION)
   target_link_libraries(FairLogger PUBLIC Boost::boost)

FairLoggerTest.cmake

@@ -15,10 +15,14 @@ set(CTEST_USE_LAUNCHERS ON)
 set(CTEST_CONFIGURATION_TYPE "RelWithDebInfo")
 
 if(NOT NCPUS)
-  include(ProcessorCount)
-  ProcessorCount(NCPUS)
-  if(NCPUS EQUAL 0)
-    set(NCPUS 1)
+  if(ENV{SLURM_CPUS_PER_TASK})
+    set(NCPUS $ENV{SLURM_CPUS_PER_TASK})
+  else()
+    include(ProcessorCount)
+    ProcessorCount(NCPUS)
+    if(NCPUS EQUAL 0)
+      set(NCPUS 1)
+    endif()
   endif()
 endif()
 
@@ -28,10 +32,10 @@ else()
   set(CTEST_SITE $ENV{CTEST_SITE})
 endif()
 
-if ("$ENV{CTEST_BUILD_NAME}" STREQUAL "")
+if ("$ENV{LABEL}" STREQUAL "")
   set(CTEST_BUILD_NAME "build")
 else()
-  set(CTEST_BUILD_NAME $ENV{CTEST_BUILD_NAME})
+  set(CTEST_BUILD_NAME $ENV{LABEL})
 endif()
 
 ctest_start(Continuous)

Jenkinsfile

@@ -0,0 +1,80 @@
+#!groovy
+
+def jobMatrix(String prefix, String type, List specs) {
+  def nodes = [:]
+  for (spec in specs) {
+    job = "${spec.os}-${spec.ver}-${spec.arch}-${spec.compiler}"
+    def label = "${type}/${job}"
+    def selector = "${spec.os}-${spec.ver}-${spec.arch}"
+    def os = spec.os
+    def ver = spec.ver
+    def check = spec.check
+
+    nodes[label] = {
+      node(selector) {
+        githubNotify(context: "${prefix}/${label}", description: 'Building ...', status: 'PENDING')
+        try {
+          deleteDir()
+          checkout scm
+
+          def jobscript = 'job.sh'
+          def ctestcmd = "ctest -S FairLoggerTest.cmake -V --output-on-failure"
+          sh "echo \"set -e\" >> ${jobscript}"
+          sh "echo \"export LABEL=\\\"\${JOB_BASE_NAME} ${label}\\\"\" >> ${jobscript}"
+          if (selector =~ /^macos/) {
+            sh "echo \"${ctestcmd}\" >> ${jobscript}"
+            sh "cat ${jobscript}"
+            sh "bash ${jobscript}"
+          } else {
+            def containercmd = "singularity exec -B/shared ${env.SINGULARITY_CONTAINER_ROOT}/fairlogger/${os}.${ver}.sif bash -l -c \\\"${ctestcmd}\\\""
+            sh """\
+              echo \"echo \\\"*** Job started at .......: \\\$(date -R)\\\"\" >> ${jobscript}
+              echo \"echo \\\"*** Job ID ...............: \\\${SLURM_JOB_ID}\\\"\" >> ${jobscript}
+              echo \"echo \\\"*** Compute node .........: \\\$(hostname -f)\\\"\" >> ${jobscript}
+              echo \"unset http_proxy\" >> ${jobscript}
+              echo \"unset HTTP_PROXY\" >> ${jobscript}
+              echo \"${containercmd}\" >> ${jobscript}
+            """
+            sh "cat ${jobscript}"
+            sh "test/ci/slurm-submit.sh \"FairLogger \${JOB_BASE_NAME} ${label}\" ${jobscript}"
+          }
+
+          deleteDir()
+          githubNotify(context: "${prefix}/${label}", description: 'Success', status: 'SUCCESS')
+        } catch (e) {
+          deleteDir()
+          githubNotify(context: "${prefix}/${label}", description: 'Error', status: 'ERROR')
+          throw e
+        }
+      }
+    }
+  }
+  return nodes
+}
+
+pipeline{
+  agent none
+  stages {
+    stage("Run CI Matrix") {
+      steps{
+        script {
+          def builds = jobMatrix('alfa-ci', 'build', [
+            [os: 'fedora', ver: '32',    arch: 'x86_64', compiler: 'gcc-10'],
+            [os: 'fedora', ver: '33',    arch: 'x86_64', compiler: 'gcc-10'],
+            [os: 'fedora', ver: '34',    arch: 'x86_64', compiler: 'gcc-11'],
+            [os: 'fedora', ver: '35',    arch: 'x86_64', compiler: 'gcc-11'],
+            [os: 'fedora', ver: '36',    arch: 'x86_64', compiler: 'gcc-12'],
+            [os: 'fedora', ver: '37',    arch: 'x86_64', compiler: 'gcc-12'],
+            [os: 'fedora', ver: '38',    arch: 'x86_64', compiler: 'gcc-13'],
+            [os: 'fedora', ver: '39',    arch: 'x86_64', compiler: 'gcc-13'],
+            [os: 'macos',  ver: '13',    arch: 'x86_64', compiler: 'apple-clang-15'],
+            [os: 'macos',  ver: '14',    arch: 'x86_64', compiler: 'apple-clang-15'],
+            [os: 'macos',  ver: '14',    arch: 'arm64',  compiler: 'apple-clang-15'],
+          ])
+
+          parallel(builds)
+        }
+      }
+    }
+  }
+}

README.md

@@ -68,11 +68,9 @@ A number of additional logging macros are provided:
 - `LOGV(severity, verbosity)` Log the line with the provided verbosity, e.g. `LOG(info, veryhigh) << "abcd";`
 - `LOGF(severity, ...)` The arguments are given to `fmt::printf`, which formats the string using a [printf syntax](https://fmt.dev/dev/api.html#printf-formatting) and the result is logged, e.g. `LOGF(info, "Hello %s!", "world");`
 - `LOGP(severity, ...)` The arguments are given to `fmt::format`, which formats the string using a [Python-like syntax](https://fmt.dev/dev/syntax.html) and the result is logged, e.g. `LOGP(info, "Hello {}!", "world");`
-- `LOGPD(severity, ...)` Same as `LOGP`, but accepts dynamic severity (runtime variable), e.g. `LOGPD(dynamicSeverity, "Hello {}!", "world");`
-- `LOGFD(severity, ...)` Same as `LOGF`, but accepts dynamic severity (runtime variable), e.g. `LOGFD(dynamicSeverity, "Hello %s!", "world");`
 - `LOGN(severity)` Logs an empty line, e.g. `LOGN(info);`
 - `LOG_IF(severity, condition)` Logs the line if the provided condition if true
-- `LOGD(severity, file, line, f)` Logs the line with the provided file, line and function parameters (accepts severity as a variable), e.g. `LOGD(dynamicSeverity, "main.cpp", "42", "main");`
+- `LOGD(severity, file, line, f)` Logs the line with the provided file, line and function parameters (only if the active verbosity allows it).
 
 ## 3. Severity
 
@@ -102,7 +100,6 @@ where severity level is one of the following:
 "important",
 "alarm",
 "error",
-"critical",
 "fatal",
 ```
 
@@ -226,7 +223,7 @@ If only output from custom sinks is desirable, console/file sinks must be deacti
 
 ## Naming conflicts?
 
-By default, `<fairlogger/Logger.h>` defines unprefixed macros: `LOG`, `LOGV`, `LOGF`, `LOGP`, `LOGPD`, `LOGFD`, `LOGN`, `LOGD`, `LOG_IF`.
+By default, `<fairlogger/Logger.h>` defines unprefixed macros: `LOG`, `LOGV`, `LOGF`, `LOGP`, `LOGN`, `LOGD`, `LOG_IF`.
 
 Define an option `FAIR_NO_LOG*` to prevent the above unprefixed macros to be defined, e.g.
 

cmake/FairLoggerLib.cmake

@@ -94,7 +94,7 @@ macro(set_fairlogger_defaults)
   endif()
 
   # Handle C++ standard level
-  set(PROJECT_MIN_CXX_STANDARD 17)
+  set(PROJECT_MIN_CXX_STANDARD 14)
   if(CMAKE_CXX_STANDARD LESS PROJECT_MIN_CXX_STANDARD)
     message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.")
   endif()

logger/Logger.cxx

@@ -1,12 +1,11 @@
 /********************************************************************************
- * Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 #include "Logger.h"
-#include <string_view>
 
 #if FMT_VERSION < 60000
 #include <fmt/time.h>
@@ -45,59 +44,58 @@ const string Logger::fProcessName = program_invocation_short_name;
 const string Logger::fProcessName = "?";
 #endif
 
-const unordered_map<string_view, Verbosity> Logger::fVerbosityMap =
+const unordered_map<string, Verbosity> Logger::fVerbosityMap =
 {
-    { {"veryhigh"}, Verbosity::veryhigh },
-    { {"high"},     Verbosity::high     },
-    { {"medium"},   Verbosity::medium   },
-    { {"low"},      Verbosity::low      },
-    { {"verylow"},  Verbosity::verylow  },
-    { {"VERYHIGH"}, Verbosity::veryhigh },
-    { {"HIGH"},     Verbosity::high     },
-    { {"MEDIUM"},   Verbosity::medium   },
-    { {"LOW"},      Verbosity::low      },
-    { {"VERYLOW"},  Verbosity::verylow  },
-    { {"user1"},    Verbosity::user1    },
-    { {"user2"},    Verbosity::user2    },
-    { {"user3"},    Verbosity::user3    },
-    { {"user4"},    Verbosity::user4    }
+    { "veryhigh", Verbosity::veryhigh },
+    { "high",     Verbosity::high     },
+    { "medium",   Verbosity::medium   },
+    { "low",      Verbosity::low      },
+    { "verylow",  Verbosity::verylow  },
+    { "VERYHIGH", Verbosity::veryhigh },
+    { "HIGH",     Verbosity::high     },
+    { "MEDIUM",   Verbosity::medium   },
+    { "LOW",      Verbosity::low      },
+    { "VERYLOW",  Verbosity::verylow  },
+    { "user1",    Verbosity::user1    },
+    { "user2",    Verbosity::user2    },
+    { "user3",    Verbosity::user3    },
+    { "user4",    Verbosity::user4    }
 };
 
-const unordered_map<string_view, Severity> Logger::fSeverityMap =
+const unordered_map<string, Severity> Logger::fSeverityMap =
 {
-    { {"nolog"},     Severity::nolog     },
-    { {"NOLOG"},     Severity::nolog     },
-    { {"fatal"},     Severity::fatal     },
-    { {"FATAL"},     Severity::fatal     },
-    { {"critical"},  Severity::critical  },
-    { {"error"},     Severity::error     },
-    { {"ERROR"},     Severity::error     },
-    { {"alarm"},     Severity::alarm     },
-    { {"important"}, Severity::important },
-    { {"warn"},      Severity::warn      },
-    { {"WARN"},      Severity::warn      },
-    { {"warning"},   Severity::warn      },
-    { {"WARNING"},   Severity::warn      },
-    { {"state"},     Severity::state     },
-    { {"STATE"},     Severity::state     },
-    { {"info"},      Severity::info      },
-    { {"INFO"},      Severity::info      },
-    { {"detail"},    Severity::detail    },
-    { {"debug"},     Severity::debug     },
-    { {"DEBUG"},     Severity::debug     },
-    { {"debug1"},    Severity::debug1    },
-    { {"DEBUG1"},    Severity::debug1    },
-    { {"debug2"},    Severity::debug2    },
-    { {"DEBUG2"},    Severity::debug2    },
-    { {"debug3"},    Severity::debug3    },
-    { {"DEBUG3"},    Severity::debug3    },
-    { {"debug4"},    Severity::debug4    },
-    { {"DEBUG4"},    Severity::debug4    },
-    { {"trace"},     Severity::trace     },
-    { {"TRACE"},     Severity::trace     }
+    { "nolog",     Severity::nolog     },
+    { "NOLOG",     Severity::nolog     },
+    { "fatal",     Severity::fatal     },
+    { "FATAL",     Severity::fatal     },
+    { "error",     Severity::error     },
+    { "ERROR",     Severity::error     },
+    { "alarm",     Severity::alarm     },
+    { "important", Severity::important },
+    { "warn",      Severity::warn      },
+    { "WARN",      Severity::warn      },
+    { "warning",   Severity::warn      },
+    { "WARNING",   Severity::warn      },
+    { "state",     Severity::state     },
+    { "STATE",     Severity::state     },
+    { "info",      Severity::info      },
+    { "INFO",      Severity::info      },
+    { "detail",    Severity::detail    },
+    { "debug",     Severity::debug     },
+    { "DEBUG",     Severity::debug     },
+    { "debug1",    Severity::debug1    },
+    { "DEBUG1",    Severity::debug1    },
+    { "debug2",    Severity::debug2    },
+    { "DEBUG2",    Severity::debug2    },
+    { "debug3",    Severity::debug3    },
+    { "DEBUG3",    Severity::debug3    },
+    { "debug4",    Severity::debug4    },
+    { "DEBUG4",    Severity::debug4    },
+    { "trace",     Severity::trace     },
+    { "TRACE",     Severity::trace     }
 };
 
-const array<string_view, 16> Logger::fSeverityNames =
+const array<string, 15> Logger::fSeverityNames =
 {
     {
         "NOLOG",
@@ -114,12 +112,11 @@ const array<string_view, 16> Logger::fSeverityNames =
         "IMPORTANT",
         "ALARM",
         "ERROR",
-        "CRITICAL",
         "FATAL"
     }
 };
 
-const array<string_view, 9> Logger::fVerbosityNames =
+const array<string, 9> Logger::fVerbosityNames =
 {
     {
         "verylow",
@@ -147,11 +144,12 @@ map<Verbosity, VSpec> Logger::fVerbosities =
     { Verbosity::user4,    VSpec::Make(VSpec::Info::severity)                                                                                        }
 };
 
-Logger::Logger(Severity severity, Verbosity verbosity, std::string_view file, std::string_view line, std::string_view func)
+Logger::Logger(Severity severity, Verbosity verbosity, const string& file, const string& line, const string& func)
     : fTimeCalculated(false)
 {
     if (!fIsDestructed) {
         size_t pos = file.rfind("/");
+
         // fInfos.timestamp is filled conditionally
         // fInfos.us is filled conditionally
         fInfos.process_name = fProcessName;
@@ -291,7 +289,6 @@ string Logger::GetColoredSeverityString(Severity severity)
     switch (severity) {
         case Severity::nolog:     return "\033[01;39mNOLOG\033[0m";     break;
         case Severity::fatal:     return "\033[01;31mFATAL\033[0m";     break;
-        case Severity::critical:  return "\033[01;31mCRITICAL\033[0m";  break;
         case Severity::error:     return "\033[01;31mERROR\033[0m";     break;
         case Severity::alarm:     return "\033[01;33mALARM\033[0m";     break;
         case Severity::important: return "\033[01;32mIMPORTANT\033[0m"; break;

logger/Logger.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -45,7 +45,6 @@
 #include <time.h> // time_t
 #include <type_traits> // is_same
 #include <unordered_map>
-#include <string_view>
 #include <utility> // pair
 
 namespace fair
@@ -67,8 +66,7 @@ enum class Severity : int
     important = 11,
     alarm = 12,
     error = 13,
-    critical = 14,
-    fatal = 15,
+    fatal = 14,
     // aliases
     warning = warn,
     // backwards-compatibility
@@ -177,19 +175,19 @@ struct LogMetaData
 {
     std::time_t timestamp;
     std::chrono::microseconds us;
-    std::string_view process_name;
-    std::string_view file;
-    std::string_view line;
-    std::string_view func;
-    std::string_view severity_name;
+    std::string process_name;
+    std::string file;
+    std::string line;
+    std::string func;
+    std::string severity_name;
     fair::Severity severity;
 };
 
 class Logger
 {
   public:
-    Logger(Severity severity, Verbosity verbosity, std::string_view file, std::string_view line, std::string_view func);
-    Logger(Severity severity, std::string_view file, std::string_view line, std::string_view func)
+    Logger(Severity severity, Verbosity verbosity, const std::string& file, const std::string& line, const std::string& func);
+    Logger(Severity severity, const std::string& file, const std::string& line, const std::string& func)
         : Logger(severity, fVerbosity, file, line, func)
     {}
     virtual ~Logger() noexcept(false);
@@ -246,7 +244,7 @@ class Logger
 
     static std::string startColor(Color color) { return fmt::format("\033[01;{}m", static_cast<int>(color)); }
     static std::string endColor() { return "\033[0m"; }
-    static std::string ColorOut(Color c, std::string_view s) { return fmt::format("\033[01;{}m{}\033[0m", static_cast<int>(c), s); }
+    static std::string ColorOut(Color c, const std::string& s) { return fmt::format("\033[01;{}m{}\033[0m", static_cast<int>(c), s); }
     static std::string GetColoredSeverityString(Severity severity);
 
     static void SetConsoleSeverity(const Severity severity);
@@ -287,8 +285,8 @@ class Logger
 
     static void RemoveFileSink();
 
-    static std::string_view SeverityName(Severity s) { return fSeverityNames.at(static_cast<size_t>(s)); }
-    static std::string_view VerbosityName(Verbosity v) { return fVerbosityNames.at(static_cast<size_t>(v)); }
+    static std::string SeverityName(Severity s) { return fSeverityNames.at(static_cast<size_t>(s)); }
+    static std::string VerbosityName(Verbosity v) { return fVerbosityNames.at(static_cast<size_t>(v)); }
 
     static void OnFatal(std::function<void()> func);
 
@@ -324,10 +322,10 @@ class Logger
     Logger& operator<<(std::ios_base& (*manip) (std::ios_base&));
     Logger& operator<<(std::ostream& (*manip) (std::ostream&));
 
-    static const std::unordered_map<std::string_view, Verbosity> fVerbosityMap;
-    static const std::unordered_map<std::string_view, Severity> fSeverityMap;
-    static const std::array<std::string_view, 16> fSeverityNames;
-    static const std::array<std::string_view, 9> fVerbosityNames;
+    static const std::unordered_map<std::string, Verbosity> fVerbosityMap;
+    static const std::unordered_map<std::string, Severity> fSeverityMap;
+    static const std::array<std::string, 15> fSeverityNames;
+    static const std::array<std::string, 9> fVerbosityNames;
 
     // protection for use after static destruction took place
     static bool fIsDestructed;
@@ -394,16 +392,16 @@ inline std::ostream& operator<<(std::ostream& os, const Verbosity& v) { return o
 #undef LOGV
 #define LOGV FAIR_LOGV
 #endif
-// allow user of this header file to prevent definition of the LOGP macro, by defining FAIR_NO_LOGP before including this header
-#ifndef FAIR_NO_LOGP
-#undef LOGP
-#define LOGP FAIR_LOGP
-#endif
 // allow user of this header file to prevent definition of the LOGF macro, by defining FAIR_NO_LOGF before including this header
 #ifndef FAIR_NO_LOGF
 #undef LOGF
 #define LOGF FAIR_LOGF
 #endif
+// allow user of this header file to prevent definition of the LOGP macro, by defining FAIR_NO_LOGP before including this header
+#ifndef FAIR_NO_LOGP
+#undef LOGP
+#define LOGP FAIR_LOGP
+#endif
 // allow user of this header file to prevent definition of the LOGN macro, by defining FAIR_NO_LOGN before including this header
 #ifndef FAIR_NO_LOGN
 #undef LOGN
@@ -419,16 +417,6 @@ inline std::ostream& operator<<(std::ostream& os, const Verbosity& v) { return o
 #undef LOG_IF
 #define LOG_IF FAIR_LOG_IF
 #endif
-// allow user of this header file to prevent definition of the LOGPD macro, by defining FAIR_NO_LOGPD before including this header
-#ifndef FAIR_NO_LOGPD
-#undef LOGPD
-#define LOGPD FAIR_LOGPD
-#endif
-// allow user of this header file to prevent definition of the LOGFD macro, by defining FAIR_NO_LOGFD before including this header
-#ifndef FAIR_NO_LOGFD
-#undef LOGFD
-#define LOGFD FAIR_LOGFD
-#endif
 
 // Log line if the provided severity is below or equals the configured one
 #define FAIR_LOG(severity) \
@@ -443,19 +431,8 @@ inline std::ostream& operator<<(std::ostream& os, const Verbosity& v) { return o
             fair::Logger(fair::Severity::severity, fair::Verbosity::verbosity, MSG_ORIGIN)
 
 // Log with fmt- or printf-like formatting
-#define FAIR_LOGP(severity, ...) FAIR_LOG(severity) << fmt::format(__VA_ARGS__)
-#define FAIR_LOGF(severity, ...) FAIR_LOG(severity) << fmt::sprintf(__VA_ARGS__)
-
-// Log with fmt- or printf-like formatting (dynamic severity)
-#define FAIR_LOGPD(severity, ...) \
-    for (bool fairLOggerunLikelyvariable3 = false; !fair::Logger::SuppressSeverity(severity) && !fairLOggerunLikelyvariable3; fairLOggerunLikelyvariable3 = true) \
-        for (bool fairLOggerunLikelyvariable = false; fair::Logger::Logging(severity) && !fairLOggerunLikelyvariable; fairLOggerunLikelyvariable = true) \
-            fair::Logger(severity, MSG_ORIGIN) << fmt::format(__VA_ARGS__)
-
-#define FAIR_LOGFD(severity, ...) \
-    for (bool fairLOggerunLikelyvariable3 = false; !fair::Logger::SuppressSeverity(severity) && !fairLOggerunLikelyvariable3; fairLOggerunLikelyvariable3 = true) \
-        for (bool fairLOggerunLikelyvariable = false; fair::Logger::Logging(severity) && !fairLOggerunLikelyvariable; fairLOggerunLikelyvariable = true) \
-            fair::Logger(severity, MSG_ORIGIN) << fmt::sprintf(__VA_ARGS__)
+#define FAIR_LOGP(severity, ...) LOG(severity) << fmt::format(__VA_ARGS__)
+#define FAIR_LOGF(severity, ...) LOG(severity) << fmt::sprintf(__VA_ARGS__)
 
 // Log an empty line
 #define FAIR_LOGN(severity) \
@@ -472,6 +449,6 @@ inline std::ostream& operator<<(std::ostream& os, const Verbosity& v) { return o
 #define FAIR_LOG_IF(severity, condition) \
     for (bool fairLOggerunLikelyvariable4 = false; !fair::Logger::SuppressSeverity(fair::Severity::severity) && !fairLOggerunLikelyvariable4; fairLOggerunLikelyvariable4 = true) \
         for (bool fairLOggerunLikelyvariable2 = false; condition && !fairLOggerunLikelyvariable2; fairLOggerunLikelyvariable2 = true) \
-            FAIR_LOG(severity)
+            LOG(severity)
 
 #endif // FAIR_LOGGER_H

test/cycle.cxx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2015-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -38,7 +38,7 @@ int main()
         Logger::SetConsoleSeverity(Severity::fatal);
         cout << "initial severity >" << Logger::GetConsoleSeverity() << "<" << endl << endl;
 
-        array<Severity, 16> severitiesUp{{ Severity::nolog, Severity::trace, Severity::debug4, Severity::debug3, Severity::debug2, Severity::debug1, Severity::debug, Severity::detail, Severity::info, Severity::state, Severity::warn, Severity::important, Severity::alarm, Severity::error, Severity::critical, Severity::fatal }};
+        array<Severity, 15> severitiesUp{{ Severity::nolog, Severity::trace, Severity::debug4, Severity::debug3, Severity::debug2, Severity::debug1, Severity::debug, Severity::detail, Severity::info, Severity::state, Severity::warn, Severity::important, Severity::alarm, Severity::error, Severity::fatal }};
 #ifdef FAIR_MIN_SEVERITY
         for (unsigned int i = static_cast<int>(Severity::FAIR_MIN_SEVERITY); i < severitiesUp.size(); ++i) {
 #else
@@ -57,7 +57,7 @@ int main()
         Logger::SetConsoleSeverity(Severity::fatal);
         cout << "initial severity >" << Logger::GetConsoleSeverity() << "<" << endl << endl;
 
-        array<Severity, 16> severitiesDown{{ Severity::critical, Severity::error, Severity::alarm, Severity::important, Severity::warn, Severity::state, Severity::info, Severity::detail, Severity::debug, Severity::debug1, Severity::debug2, Severity::debug3, Severity::debug4, Severity::trace, Severity::nolog, Severity::fatal }};
+        array<Severity, 15> severitiesDown{{ Severity::error, Severity::alarm, Severity::important, Severity::warn, Severity::state, Severity::info, Severity::detail, Severity::debug, Severity::debug1, Severity::debug2, Severity::debug3, Severity::debug4, Severity::trace, Severity::nolog, Severity::fatal }};
 #ifdef FAIR_MIN_SEVERITY
         for (unsigned int i = 0; i < severitiesDown.size() - static_cast<int>(Severity::FAIR_MIN_SEVERITY) - 1; ++i) {
 #else

test/logger.cxx

@@ -31,7 +31,6 @@ void printEverySeverity()
     LOG(important) << "important message, counter: " << i++;
     LOG(alarm)     << "alarm message, counter: "     << i++;
     LOG(error)     << "error message, counter: "     << i++;
-    LOG(critical)  << "critical message, counter: "  << i++;
     LOG(fatal)     << "fatal message, counter: "     << i++;
 }
 

test/macros.cxx

@@ -51,13 +51,6 @@ int main()
         CheckOutput(ToStr(R"(^\[.*\]\[\d{2}:\d{2}:\d{2}\.\d{6}\]\[FATAL\]\[a:4:b\])", " c\n$"), []() {
             LOGD(Severity::fatal, "a", "4", "b") << "c";
         });
-
-        // Test dynamic severity macros
-        Logger::SetVerbosity(Verbosity::verylow);
-        Severity dynamicSeverity = Severity::fatal;
-
-        CheckOutput("^Hello dynamic world :-\\)!\n$", [&]() { LOGPD(dynamicSeverity, "Hello {} {}!", "dynamic world", ":-)"); });
-        CheckOutput("^Hello dynamic world :-\\)!\n$", [&]() { LOGFD(dynamicSeverity, "Hello %s %s!", "dynamic world", ":-)"); });
     } catch (runtime_error& rte) {
         cout << rte.what() << endl;
         return 1;

test/nolog.cxx

@@ -27,7 +27,6 @@ void printEverySeverity()
     LOG(important) << "important message ";
     LOG(alarm)     << "alarm message ";
     LOG(error)     << "error message ";
-    LOG(critical)  << "critical message ";
 }
 
 void silentlyPrintAllVerbositiesWithSeverity(Severity sev)

test/severity.cxx

@@ -34,7 +34,6 @@ uint32_t printEverySeverity(uint32_t i)
     LOG(important) << "important message, counter: " << i++;
     LOG(alarm)     << "alarm message, counter: "     << i++;
     LOG(error)     << "error message, counter: "     << i++;
-    LOG(critical)  << "critical message, counter: "  << i++;
     LOG(fatal)     << "fatal message, counter: "     << i++;
 
     return i;