adding GPUCritical, putting InfoLoggerMessageOption initializer to log() call

Author: ehellbar

Framework/DataTakingSupport/src/Plugin.cxx

@@ -132,15 +132,13 @@ auto createInfoLoggerSinkHelper(InfoLogger* logger, InfoLoggerContext* ctx)
         return;
     }
 
-    InfoLogger::InfoLoggerMessageOption opt = {
-      severity,
-      level,
-      InfoLogger::undefinedMessageOption.errorCode,
-      metadata.file,
-      atoi(std::string(metadata.line.data(), metadata.line.size()).c_str())};
-
     if (logger) {
-      logger->log(opt, *ctx, "%s", content.c_str());
+      logger->log({severity,
+                   level,
+                   InfoLogger::undefinedMessageOption.errorCode,
+                   std::string(metadata.file).c_str(),
+                   atoi(std::string(metadata.line).c_str())},
+                  *ctx, "%s", content.c_str());
     }
   };
 };

GPU/GPUTracking/Definitions/GPULogging.h

@@ -24,6 +24,7 @@
   #define GPUWarning(...)
   #define GPUAlarm(...)
   #define GPUError(...)
+  #define GPUCritical(...)
   #define GPUFatal(...)
 #elif defined(GPUCA_STANDALONE) && !defined(GPUCA_GPUCODE_DEVICE) && !defined(GPUCA_NO_FMT)
   #include <cstdio>
@@ -38,6 +39,7 @@
       fmt::fprintf(stderr, string "\n", ##__VA_ARGS__); \
     }
   #define GPUError(...) GPUWarning(__VA_ARGS__)
+  #define GPUCritical(...) GPUWarning(__VA_ARGS__)
   #define GPUAlarm(...) GPUWarning(__VA_ARGS__)
   #define GPUFatal(string, ...)                         \
     {                                                   \
@@ -64,6 +66,7 @@
       }
     #define GPUAlarm(...) GPUWarning(__VA_ARGS__)
     #define GPUError(...) GPUWarning(__VA_ARGS__)
+    #define GPUCritical(...) GPUWarning(__VA_ARGS__)
     #define GPUFatal(string, ...)                  \
       {                                            \
         fprintf(stderr, string "\n", __VA_ARGS__); \
@@ -78,6 +81,7 @@
   #define GPUWarning(...) LOGF(warning, __VA_ARGS__)
   #define GPUAlarm(...) LOGF(alarm, __VA_ARGS__)
   #define GPUError(...) LOGF(error, __VA_ARGS__)
+  #define GPUCritical(...) LOGF(critical, __VA_ARGS__)
   #define GPUFatal(...) LOGF(fatal, __VA_ARGS__)
 #endif