Merge pull request #15 from esp-arduino-libs/feat/update_cxx_log_trace_guard

feat(log): update CXX log trace guard for compatibility with GNU++20 and below

Author: Lzw655

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## v0.2.3 - 2025-07-03
 
+### Enhancements:
+
+* feat(log): update CXX log trace guard for compatibility with GNU++20 and below
+
 ### Bugfixes:
 
 * fix(log): update CXX log trace guard

CMakeLists.txt

@@ -17,7 +17,6 @@ endif()
 target_compile_options(${COMPONENT_LIB}
     PUBLIC
         -Wno-missing-field-initializers
-        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++20>
 )
 
 if(NOT ESP_PLATFORM)

src/log/esp_utils_log.hpp

@@ -10,14 +10,23 @@
 #include <type_traits>
 #include <utility>
 #include <string>
-#include <source_location>
+
+// Check C++20 support
+#if __cplusplus >= 202002L && defined(__cpp_nontype_template_args)
+#   define ESP_UTILS_LOG_CXX20_SUPPORT 1
+#   include <source_location>
+#else
+#   define ESP_UTILS_LOG_CXX20_SUPPORT 0
+#endif
+
 #include "esp_utils_log.h"
 
 namespace esp_utils {
 namespace detail {
 
 std::string parseFunctionName(const char *func_name);
 
+#if ESP_UTILS_LOG_CXX20_SUPPORT
 // Template for string NTTP parameters
 template <size_t N>
 struct FixedString {
@@ -90,12 +99,72 @@ class log_trace_guard {
         }
     }
 
+    log_trace_guard(const log_trace_guard &) = delete;
+    log_trace_guard(log_trace_guard &&) = delete;
+    log_trace_guard &operator=(const log_trace_guard &) = delete;
+    log_trace_guard &operator=(log_trace_guard &&) = delete;
+
+private:
+    int _line = 0;
+    std::string _func_name;
+    std::string _file_name;
+    const void *_this_ptr = nullptr;
+};
+
+#else
+
+// C++17 fallback implementation without FixedString and source_location
+class log_trace_guard {
+public:
+    log_trace_guard(const char *tag, const char *func, const char *file, int line, const void *this_ptr = nullptr)
+        : _tag(tag), _line(line), _this_ptr(this_ptr)
+    {
+        _func_name = std::string(func);
+        if (_func_name.empty()) {
+            _func_name = "???";
+        }
+        _file_name = std::string(esp_utils_log_extract_file_name(file));
+        if (_file_name.empty()) {
+            _file_name = "???";
+        }
+
+        if (_this_ptr) {
+            ESP_UTILS_LOGD_IMPL_FUNC(
+                _tag, "[%s:%04d](%s): (@%p) Enter", _file_name.c_str(), _line, _func_name.c_str(), _this_ptr
+            );
+        } else {
+            ESP_UTILS_LOGD_IMPL_FUNC(
+                _tag, "[%s:%04d](%s): Enter", _file_name.c_str(), _line, _func_name.c_str()
+            );
+        }
+    }
+
+    ~log_trace_guard()
+    {
+        if (_this_ptr) {
+            ESP_UTILS_LOGD_IMPL_FUNC(
+                _tag, "[%s:%04d](%s): (@%p) Exit", _file_name.c_str(), _line, _func_name.c_str(), _this_ptr
+            );
+        } else {
+            ESP_UTILS_LOGD_IMPL_FUNC(
+                _tag, "[%s:%04d](%s): Exit", _file_name.c_str(), _line, _func_name.c_str()
+            );
+        }
+    }
+
+    log_trace_guard(const log_trace_guard &) = delete;
+    log_trace_guard(log_trace_guard &&) = delete;
+    log_trace_guard &operator=(const log_trace_guard &) = delete;
+    log_trace_guard &operator=(log_trace_guard &&) = delete;
+
 private:
+    const char *_tag;
     int _line = 0;
     std::string _func_name;
     std::string _file_name;
     const void *_this_ptr = nullptr;
 };
+#endif
 
 } // namespace detail
 } // namespace esp_utils
@@ -105,9 +174,14 @@ class log_trace_guard {
 #   define ESP_UTILS_LOG_TRACE_ENTER_WITH_THIS() ESP_UTILS_LOGD("(@%p) Enter", this)
 #   define ESP_UTILS_LOG_TRACE_EXIT_WITH_THIS()  ESP_UTILS_LOGD("(@%p) Exit", this)
 
-#   define ESP_UTILS_LOG_MAKE_FS(str) []{ constexpr esp_utils::detail::FixedString<sizeof(str)> s(str); return s; }()
-#   define ESP_UTILS_LOG_TRACE_GUARD()           esp_utils::detail::log_trace_guard<ESP_UTILS_LOG_MAKE_FS(ESP_UTILS_LOG_TAG)> _log_trace_guard_{}
-#   define ESP_UTILS_LOG_TRACE_GUARD_WITH_THIS() esp_utils::detail::log_trace_guard<ESP_UTILS_LOG_MAKE_FS(ESP_UTILS_LOG_TAG)> _log_trace_guard_{this}
+#   if ESP_UTILS_LOG_CXX20_SUPPORT
+#       define ESP_UTILS_LOG_MAKE_FS(str) []{ constexpr esp_utils::detail::FixedString<sizeof(str)> s(str); return s; }()
+#       define ESP_UTILS_LOG_TRACE_GUARD()           esp_utils::detail::log_trace_guard<ESP_UTILS_LOG_MAKE_FS(ESP_UTILS_LOG_TAG)> _log_trace_guard_{}
+#       define ESP_UTILS_LOG_TRACE_GUARD_WITH_THIS() esp_utils::detail::log_trace_guard<ESP_UTILS_LOG_MAKE_FS(ESP_UTILS_LOG_TAG)> _log_trace_guard_{this}
+#   else
+#       define ESP_UTILS_LOG_TRACE_GUARD()           esp_utils::detail::log_trace_guard _log_trace_guard_{ESP_UTILS_LOG_TAG, __func__, __FILE__, __LINE__}
+#       define ESP_UTILS_LOG_TRACE_GUARD_WITH_THIS() esp_utils::detail::log_trace_guard _log_trace_guard_{ESP_UTILS_LOG_TAG, __func__, __FILE__, __LINE__, this}
+#   endif
 #else
 #   define ESP_UTILS_LOG_TRACE_ENTER_WITH_THIS()
 #   define ESP_UTILS_LOG_TRACE_EXIT_WITH_THIS()

test_apps/sdkconfig.ci.log_debug

@@ -1,2 +1,3 @@
+CONFIG_ESP_UTILS_CONF_LOG_IMPL_STDLIB=y
 CONFIG_ESP_UTILS_CONF_LOG_LEVEL_DEBUG=y
 CONFIG_ESP_UTILS_CONF_ENABLE_LOG_TRACE=y