From 03eb328d817faedb9941d51800ff29948ee050ef Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Thu, 28 May 2026 11:21:36 -0500
Subject: [PATCH] Allow dynamic trace on any platform that can support it.

---
 cmake/targets/linux.cmake |  5 ++---
 src/dusk/CMakeLists.txt   |  7 +++++++
 src/dusk/assert/assert.c  | 40 ++++++++++++++++++++-------------------
 src/dusk/util/memory.c    | 11 ++++++++---
 src/dusk/util/memory.h    |  7 +++++++
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/cmake/targets/linux.cmake b/cmake/targets/linux.cmake
index 51038f1b..a6242fb7 100644
--- a/cmake/targets/linux.cmake
+++ b/cmake/targets/linux.cmake
@@ -16,9 +16,6 @@ else()
   )
 endif()
 
-# Export symbols so backtrace_symbols() can resolve function names.
-target_link_options(${DUSK_LIBRARY_TARGET_NAME} PUBLIC -rdynamic)
-
 # Link required libraries.
 target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
   SDL2
@@ -29,6 +26,8 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
   # CURL::libcurl
 )
 
+set(DUSK_BACKTRACE ON CACHE BOOL "Enable backtrace support for assert failures.")
+
 # Define platform-specific macros.
 target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
   DUSK_SDL2
diff --git a/src/dusk/CMakeLists.txt b/src/dusk/CMakeLists.txt
index 21bf7951..d1a5e7c6 100644
--- a/src/dusk/CMakeLists.txt
+++ b/src/dusk/CMakeLists.txt
@@ -32,6 +32,13 @@ if(NOT yyjson_FOUND)
   endif()
 endif()
 
+if(DUSK_BACKTRACE)
+  target_link_options(${DUSK_LIBRARY_TARGET_NAME} PUBLIC -rdynamic)
+  target_compile_definitions(${DUSK_BINARY_TARGET_NAME} PUBLIC
+    DUSK_BACKTRACE
+  )
+endif()
+
 # Includes
 target_include_directories(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
diff --git a/src/dusk/assert/assert.c b/src/dusk/assert/assert.c
index f8f4b4dd..9462a235 100644
--- a/src/dusk/assert/assert.c
+++ b/src/dusk/assert/assert.c
@@ -8,24 +8,7 @@
 #include "assert.h"
 #include "log/log.h"
 #include "util/string.h"
-
-#ifdef DUSK_LINUX
-  #include <execinfo.h>
-  #include <stdlib.h>
-
-  static void assertLogBacktrace(void) {
-    void *frames[64];
-    int count = backtrace(frames, 64);
-    char **symbols = backtrace_symbols(frames, count);
-    logError("Stack trace:\n");
-    if(symbols) {
-      for(int i = 0; i < count; i++) {
-        logError("  %s\n", symbols[i]);
-      }
-      free(symbols);
-    }
-  }
-#endif
+#include "util/memory.h"
 
 #ifndef DUSK_ASSERTIONS_FAKED
   #ifdef DUSK_TEST_ASSERT
@@ -43,6 +26,25 @@
       );
     }
   #else
+    #ifdef DUSK_BACKTRACE
+      #include <execinfo.h>
+      #include <stdlib.h>
+
+      static void assertLogBacktrace(void) {
+        void *frames[64];
+        int count = backtrace(frames, 64);
+        char **symbols = backtrace_symbols(frames, count);
+        memoryTrack(symbols);
+        logError("Stack trace:\n");
+        if(symbols) {
+          for(int i = 0; i < count; i++) {
+            logError("  %s\n", symbols[i]);
+          }
+          memoryFree(symbols);
+        }
+      }
+    #endif
+
     void assertTrueImpl(
       const char *file,
       const int32_t line,
@@ -56,7 +58,7 @@
           line,
           message
         );
-        #ifdef DUSK_LINUX
+        #ifdef DUSK_BACKTRACE
           assertLogBacktrace();
         #endif
         abort();
diff --git a/src/dusk/util/memory.c b/src/dusk/util/memory.c
index 878e81b1..903ef03b 100644
--- a/src/dusk/util/memory.c
+++ b/src/dusk/util/memory.c
@@ -13,11 +13,16 @@ size_t memoryGetAllocatedCount(void) {
   return MEMORY_POINTERS_IN_USE;
 }
 
+void memoryTrack(void *ptr) {
+  assertNotNull(ptr, "Cannot track NULL pointer.");
+  MEMORY_POINTERS_IN_USE++;
+}
+
 void * memoryAllocate(const size_t size) {
   assertTrue(size > 0, "Cannot allocate 0 bytes of memory.");
   void *ptr = malloc(size);
   assertNotNull(ptr, "Memory allocation failed.");
-  MEMORY_POINTERS_IN_USE++;
+  memoryTrack(ptr);
   return ptr;
 }
 
@@ -26,7 +31,7 @@ void * memoryAlign(size_t alignment, size_t size) {
   assertTrue(size > 0, "Cannot allocate 0 bytes of memory.");
   void *ptr = memalign(alignment, size);
   assertNotNull(ptr, "Aligned memory allocation failed.");
-  MEMORY_POINTERS_IN_USE++;
+  memoryTrack(ptr);
   return ptr;
 }
 
@@ -124,7 +129,7 @@ void memoryCopyInterleaved(
   uint8_t *d = (uint8_t *)dest;
   const uint8_t *s = (const uint8_t *)src;
   for(size_t i = 0; i < count; i++) {
-    memcpy(d, s, elementSize);
+    memoryCopy(d, s, elementSize);
     d += destStride;
     s += srcStride;
   }
diff --git a/src/dusk/util/memory.h b/src/dusk/util/memory.h
index f5f182c6..2345ab10 100644
--- a/src/dusk/util/memory.h
+++ b/src/dusk/util/memory.h
@@ -17,6 +17,13 @@ static size_t MEMORY_POINTERS_IN_USE = 0;
  */
 size_t memoryGetAllocatedCount(void);
 
+/**
+ * Track a pointer that was malloc'd outside of the dusk engine.
+ * 
+ * @param ptr The pointer to track.
+ */
+void memoryTrack(void *ptr);
+
 /**
  * Allocates memory.
  *