Memfault Firmware SDK 0.33.4 (Build 518181)

Author: Memfault Inc

CHANGES.md

@@ -1,3 +1,12 @@
+### Changes between Memfault SDK 0.33.3 and SDK 0.33.4 - Sept 15, 2022
+
+#### :chart_with_upwards_trend: Improvements
+
+- Zephyr port updates:
+  - Handle thread abort in the task stack capture hook. Previous to this change,
+    aborted tasks would remain on the captured task list, and restarting the
+    task would create a duplicate entry.
+
 ### Changes between Memfault SDK 0.33.2 and SDK 0.33.3 - Sept 14, 2022
 
 #### :chart_with_upwards_trend: Improvements

VERSION

@@ -1,2 +1,2 @@
-BUILD ID: 517561
-GIT COMMIT: a436bb3d2
+BUILD ID: 518181
+GIT COMMIT: 091f1bf24

components/include/memfault/version.h

@@ -19,7 +19,7 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 33, .patch = 3 }
+#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 33, .patch = 4 }
 
 #ifdef __cplusplus
 }

ports/zephyr/common/memfault_zephyr_ram_regions.c

@@ -37,6 +37,12 @@ static bool prv_find_slot(size_t *idx, struct k_thread *desired_tcb) {
 
 // We intercept calls to arch_new_thread() so we can track when new tasks
 // are created
+//
+// It would be nice to use '__builtin_types_compatible_p' and '__typeof__' to
+// enforce strict abi matching in the wrapped functions, but the target
+// functions are declared in private zephyr ./kernel/include files, which are
+// not really supposed to be accessed from user code and would require some
+// dubious path hacks to get to.
 void __wrap_arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
                             char *stack_ptr, k_thread_entry_t entry,
                             void *p1, void *p2, void *p3);
@@ -56,6 +62,19 @@ void __wrap_arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
   __real_arch_new_thread(thread, stack, stack_ptr, entry, p1, p2, p3);
 }
 
+void __wrap_z_thread_abort(struct k_thread *thread);
+void __real_z_thread_abort(struct k_thread *thread);
+
+void __wrap_z_thread_abort(struct k_thread *thread) {
+  size_t idx = 0;
+  const bool slot_found = prv_find_slot(&idx, thread);
+  if (slot_found) {
+    s_task_tcbs[idx] = EMPTY_SLOT;
+  }
+
+  __real_z_thread_abort(thread);
+}
+
 MEMFAULT_WEAK
 size_t memfault_platform_sanitize_address_range(void *start_addr, size_t desired_size) {
   // NB: This only works for MCUs which have a contiguous RAM address range. (i.e Any MCU in the

ports/zephyr/v2.4/CMakeLists.txt

@@ -14,12 +14,13 @@ zephyr_include_directories(.)
 # Memfault fault handler which will collect a coredump.
 target_link_libraries(app INTERFACE "-Wl,--wrap=z_fatal_error")
 
-# We trace task creation so the task TCBs and stacks can be collected at the time
-# of a crash and all thread backtraces can be made available in the Memfault UI.
+# We trace task creation and deletion so the task TCBs and stacks can be collected at the time of a
+# crash and all thread backtraces can be made available in the Memfault UI.
 #
 # To do this we wrap the arch_new_thread() function call that is made from thread.c
 #
 # A nicer way to do this would be to make use of the "sys_trace_thread_create" macro.
 # Unfortunately, to override the macro, one must patch the Zephyr RTOS today.
 #   https://github.com/zephyrproject-rtos/zephyr/blob/390537b/include/tracing/tracing.h#L57-L61
 target_link_libraries(app INTERFACE "-Wl,--wrap=arch_new_thread")
+target_link_libraries(app INTERFACE "-Wl,--wrap=z_thread_abort")