logger: add logging to a RAM buffer

Author: antmak

CMakeLists.txt

@@ -18,9 +18,10 @@ set(srcs
 add_library(${ESP_STUB_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_STUB_LIB}
-    PUBLIC include
+    INTERFACE include
     PRIVATE include/esp-stub-lib
 )
+include_directories(include)
 
 # STUB_COMPILE_DEFS is optional definitions coming from the parent CMakeLists.txt
 target_compile_definitions(${ESP_STUB_LIB} PRIVATE ${STUB_COMPILE_DEFS})

example/CMakeLists.txt

@@ -38,7 +38,8 @@ if(${ESP_TARGET} STREQUAL "esp8266")
     target_link_options(${PROJECT_NAME} PRIVATE -Wl,--entry=stub_main_esp8266)
 endif()
 
-target_compile_definitions(${PROJECT_NAME} PRIVATE asm=__asm__ STUB_LOG_ENABLED)
+set(STUB_COMPILE_DEFS "STUB_LOG_ENABLED")
+target_compile_definitions(${PROJECT_NAME} PRIVATE asm=__asm__ ${STUB_COMPILE_DEFS})
 
 set(MAP_FILE ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}.map)
 target_link_options(${PROJECT_NAME} PRIVATE -Wl,-Map=${MAP_FILE})

example/stub_main.c

@@ -22,14 +22,6 @@ struct stub_cmd_handler {
     int (*handler)(va_list ap);
 };
 
-#ifdef STUB_LOG_ENABLED
-#define STUB_LOG_INIT(uart_num, baudrate) stub_lib_log_init(uart_num, baudrate)
-#define STUB_LOG(fmt, ...) stub_lib_log_printf(fmt, ##__VA_ARGS__)
-#else
-#define STUB_LOG_INIT(uart_num, baudrate)
-#define STUB_LOG(fmt, ...)
-#endif
-
 static  __attribute__((unused)) int handle_test1(va_list ap)
 {
     (void)ap;
@@ -84,7 +76,7 @@ int stub_main(int cmd, ...)
 
     va_start(ap, cmd);
 
-    STUB_LOG_INIT(0, 115200);
+    STUB_LOG_INIT();
 
     stub_lib_flash_init(&flash_state);
 

include/esp-stub-lib/log.h

@@ -6,15 +6,42 @@
 
 #pragma once
 
+#if defined(STUB_LOG_ENABLED)
+
+#if !defined(STUB_LIB_LOG_BUF) && !defined(STUB_LIB_LOG_UART)
+#define STUB_LIB_LOG_BUF
+#endif
+
+#if defined(STUB_LIB_LOG_BUF)
 #include <stdint.h>
 
+#if !defined(STUB_LIB_LOG_BUF_SIZE)
+#define STUB_LIB_LOG_BUF_SIZE 4096
+#endif
+
+struct stub_lib_log_buf {
+    uint32_t count;
+    char buf[STUB_LIB_LOG_BUF_SIZE];
+};
+#endif // defined(STUB_LIB_LOG_BUF)
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void stub_lib_log_init(uint8_t uart_num, uint32_t baudrate);
+void stub_lib_log_init();
 void stub_lib_log_printf(const char *fmt, ...);
 
 #ifdef __cplusplus
 }
 #endif // __cplusplus
+
+#define STUB_LOG_INIT() stub_lib_log_init()
+#define STUB_LOG(fmt, ...) stub_lib_log_printf(fmt, ##__VA_ARGS__)
+
+#else // defined(STUB_LOG_ENABLED)
+
+#define STUB_LOG_INIT()
+#define STUB_LOG(fmt, ...)
+
+#endif // defined(STUB_LOG_ENABLED)

src/log.c

@@ -3,20 +3,40 @@
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
-#include <stdint.h>
+#include <log.h>
+
+#if defined(STUB_LOG_ENABLED)
+
 #include <stdarg.h>
+extern void ets_printf(const char *fmt, ...);
 
-#include <target/esp_rom_caps.h>
+#if defined(STUB_LIB_LOG_UART)
 #include <target/uart.h>
-
-// These functions are defined in the ROM
 extern void ets_install_uart_printf(void);
-extern void ets_printf(const char *fmt, ...);
+#elif defined(STUB_LIB_LOG_BUF)
+#include <stddef.h>
+extern void ets_install_putc1(void (*p)(char c));
+extern void ets_install_putc2(void (*p)(char c));
+#endif // defined(STUB_LIB_LOG_BUF)
 
-void stub_lib_log_init(uint8_t uart_num, uint32_t baudrate)
+#if defined(STUB_LIB_LOG_BUF)
+static struct stub_lib_log_buf g_stub_lib_log_buf;
+static void stub_lib_log_buf_write_internal(char c)
 {
-    stub_target_uart_init(uart_num, baudrate);
+    g_stub_lib_log_buf.buf[g_stub_lib_log_buf.count] = c;
+    g_stub_lib_log_buf.count = (g_stub_lib_log_buf.count + 1) % STUB_LIB_LOG_BUF_SIZE;
+}
+#endif // defined(STUB_LIB_LOG_BUF)
+
+void stub_lib_log_init()
+{
+#if defined(STUB_LIB_LOG_UART)
+    stub_target_uart_init(0, 115200);
     ets_install_uart_printf();
+#elif defined(STUB_LIB_LOG_BUF)
+    ets_install_putc1(stub_lib_log_buf_write_internal);
+    ets_install_putc2(NULL);
+#endif
 }
 
 // This function is designed to avoid implementing vprintf() to reduce code size.
@@ -74,3 +94,5 @@ void stub_lib_log_printf(const char *fmt, ...)
     }
     va_end(args);
 }
+
+#endif // defined(STUB_LOG_ENABLED)