6 files changed, 46 insertions(+), 61 deletions(-)

M module-os/board/linux/port.c
M module-os/board/linux/portmacro.h
M module-utils/board/linux/log_linux.cpp
M module-utils/board/rt1051/log_rt1051.cpp
M module-utils/log/Logger.cpp
M module-utils/log/Logger.hpp

@@ 915,3 915,9 @@ unsigned long ulPortGetTimerValue( void )
      */
     return ( unsigned long ) xTimes.tms_utime;
 }
+
+
+BaseType_t xPortIsInsideInterrupt(void)
+{
+    return pdFALSE;
+}

@@ 180,6 180,8 @@ extern void vPortAddTaskHandle( void *pxTaskHandle );
 #define SIG_TICK					SIGPROF
 #define TIMER_TYPE					ITIMER_PROF */
 
+BaseType_t xPortIsInsideInterrupt(void);
+
 #ifdef __cplusplus
 }
 #endif

@@ 9,30 9,6 @@
 
 namespace Log
 {
-    void Logger::addLogHeader(logger_level level, const char *file, int line, const char *function)
-    {
-        loggerBufferCurrentPos += snprintf(&loggerBuffer[loggerBufferCurrentPos],
-                                           LOGGER_BUFFER_SIZE - loggerBufferCurrentPos,
-                                           "%d ms ",
-                                           cpp_freertos::Ticks::TicksToMs(cpp_freertos::Ticks::GetTicks()));
-
-        loggerBufferCurrentPos += snprintf(&loggerBuffer[loggerBufferCurrentPos],
-                                           LOGGER_BUFFER_SIZE - loggerBufferCurrentPos,
-                                           "%s%-5s %s%s:%s:%d:%s ",
-                                           logColors->levelColors[level].data(),
-                                           levelNames[level],
-                                           logColors->callerInfoColor.data(),
-                                           file,
-                                           function,
-                                           line,
-                                           logColors->resetColor.data());
-    }
-
-    bool Logger::filterLogs(logger_level _level)
-    {
-        return _level >= level;
-    }
-
     void Logger::logToDevice(const char *, va_list)
     {
         assert(false && "Not implemented");

@@ 9,45 9,8 @@
 #include <SEGGER_RTT.h>
 #include <ticks.hpp>
 
-/// get string description:
-/// - in critical seciton - return CRIT
-/// - in interrupt return - IRQ
-/// - else return thread name
-static inline const char *getTaskDesc()
-{
-    return xTaskGetCurrentTaskHandle() == nullptr
-               ? Log::Logger::CRIT_STR
-               : xPortIsInsideInterrupt() ? Log::Logger::IRQ_STR : pcTaskGetName(xTaskGetCurrentTaskHandle());
-}
-
 namespace Log
 {
-    void Logger::addLogHeader(logger_level level, const char *file, int line, const char *function)
-    {
-        loggerBufferCurrentPos += snprintf(&loggerBuffer[loggerBufferCurrentPos],
-                                           loggerBufferSizeLeft(),
-                                           "%lu ms ",
-                                           cpp_freertos::Ticks::TicksToMs(cpp_freertos::Ticks::GetTicks()));
-
-        loggerBufferCurrentPos += snprintf(&loggerBuffer[loggerBufferCurrentPos],
-                                           loggerBufferSizeLeft(),
-                                           "%s%-5s %s[%s] %s%s:%s:%d:%s ",
-                                           logColors->levelColors[level].data(),
-                                           levelNames[level],
-                                           logColors->serviceNameColor.data(),
-                                           getTaskDesc(),
-                                           logColors->callerInfoColor.data(),
-                                           file,
-                                           function,
-                                           line,
-                                           logColors->resetColor.data());
-    }
-
-    bool Logger::filterLogs(logger_level level)
-    {
-        return getLogLevel(getTaskDesc()) <= level;
-    }
-
     void Logger::logToDevice(const char *fmt, va_list args)
     {
         loggerBufferCurrentPos = 0;

@@ 7,6 7,8 @@
 #include "LockGuard.hpp"
 #include <Logger.hpp>
 #include <module-utils/Utils.hpp>
+#include <portmacro.h>
+#include <ticks.hpp>
 #include "macros.h"
 
 namespace Log


@@ 213,4 215,38 @@ namespace Log
     {
         file << application;
     }
+
+    const char *getTaskDesc()
+    {
+        return xTaskGetCurrentTaskHandle() == nullptr ? Log::Logger::CRIT_STR
+               : xPortIsInsideInterrupt()             ? Log::Logger::IRQ_STR
+                                                      : pcTaskGetName(xTaskGetCurrentTaskHandle());
+    }
+
+    bool Logger::filterLogs(logger_level level)
+    {
+        return getLogLevel(getTaskDesc()) <= level;
+    }
+
+    void Logger::addLogHeader(logger_level level, const char *file, int line, const char *function)
+    {
+        loggerBufferCurrentPos += snprintf(&loggerBuffer[loggerBufferCurrentPos],
+                                           LOGGER_BUFFER_SIZE - loggerBufferCurrentPos,
+                                           "%" PRIu32 " ms ",
+                                           cpp_freertos::Ticks::TicksToMs(cpp_freertos::Ticks::GetTicks()));
+
+        loggerBufferCurrentPos += snprintf(&loggerBuffer[loggerBufferCurrentPos],
+                                           LOGGER_BUFFER_SIZE - loggerBufferCurrentPos,
+                                           "%s%-5s %s[%s] %s%s:%s:%d:%s ",
+                                           logColors->levelColors[level].data(),
+                                           levelNames[level],
+                                           logColors->serviceNameColor.data(),
+                                           getTaskDesc(),
+                                           logColors->callerInfoColor.data(),
+                                           file,
+                                           function,
+                                           line,
+                                           logColors->resetColor.data());
+    }
+
 } // namespace Log

@@ 94,4 94,6 @@ namespace Log
         static const char *levelNames[];
         static std::map<std::string, logger_level> filtered;
     };
+
+    const char *getTaskDesc();
 } // namespace Log