Merge branch 'dev-platform' into dev-slice-platform

include/mimalloc-track.h

@@ -27,10 +27,12 @@ Optional:
 
   #define mi_track_align(p,alignedp,offset,size)
   #define mi_track_resize(p,oldsize,newsize)
+  #define mi_track_init()
 
 The `mi_track_align` is called right after a `mi_track_malloc` for aligned pointers in a block.
 The corresponding `mi_track_free` still uses the block start pointer and original size (corresponding to the `mi_track_malloc`).
 The `mi_track_resize` is currently unused but could be called on reallocations within a block.
+`mi_track_init` is called at program start.
 
 The following macros are for tools like asan and valgrind to track whether memory is 
 defined, undefined, or not accessible at all:
@@ -42,6 +44,7 @@ defined, undefined, or not accessible at all:
 -------------------------------------------------------------------------------------------------------*/
 
 #if MI_TRACK_VALGRIND
+// valgrind tool
 
 #define MI_TRACK_ENABLED      1
 #define MI_TRACK_HEAP_DESTROY 1           // track free of individual blocks on heap_destroy
@@ -58,6 +61,7 @@ defined, undefined, or not accessible at all:
 #define mi_track_mem_noaccess(p,size)             VALGRIND_MAKE_MEM_NOACCESS(p,size)
 
 #elif MI_TRACK_ASAN
+// address sanitizer
 
 #define MI_TRACK_ENABLED      1
 #define MI_TRACK_HEAP_DESTROY 0
@@ -71,7 +75,23 @@ defined, undefined, or not accessible at all:
 #define mi_track_mem_undefined(p,size)            ASAN_UNPOISON_MEMORY_REGION(p,size)
 #define mi_track_mem_noaccess(p,size)             ASAN_POISON_MEMORY_REGION(p,size)
 
+#elif MI_TRACK_ETW
+// windows event tracing
+
+#define MI_TRACK_ENABLED      1
+#define MI_TRACK_HEAP_DESTROY 0
+#define MI_TRACK_TOOL         "ETW"
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include "../src/prim/windows/etw.h"
+
+#define mi_track_init()                           EventRegistermicrosoft_windows_mimalloc();
+#define mi_track_malloc_size(p,reqsize,size,zero) EventWriteETW_MI_ALLOC((UINT64)(p), size)
+#define mi_track_free_size(p,size)                EventWriteETW_MI_FREE((UINT64)(p), size)
+
 #else
+// no tracking
 
 #define MI_TRACK_ENABLED      0
 #define MI_TRACK_HEAP_DESTROY 0 
@@ -79,11 +99,6 @@ defined, undefined, or not accessible at all:
 
 #define mi_track_malloc_size(p,reqsize,size,zero)
 #define mi_track_free_size(p,_size)
-#define mi_track_align(p,alignedp,offset,size)  
-#define mi_track_resize(p,oldsize,newsize)
-#define mi_track_mem_defined(p,size)
-#define mi_track_mem_undefined(p,size)
-#define mi_track_mem_noaccess(p,size)
 
 #endif
 
@@ -98,6 +113,23 @@ defined, undefined, or not accessible at all:
 #define mi_track_align(p,alignedp,offset,size)  mi_track_mem_noaccess(p,offset)
 #endif
 
+#ifndef mi_track_init
+#define mi_track_init()
+#endif
+
+#ifndef mi_track_mem_defined
+#define mi_track_mem_defined(p,size)
+#endif
+
+#ifndef mi_track_mem_undefined
+#define mi_track_mem_undefined(p,size)
+#endif
+
+#ifndef mi_track_mem_noaccess
+#define mi_track_mem_noaccess(p,size)
+#endif
+
+
 #if MI_PADDING
 #define mi_track_malloc(p,reqsize,zero) \
   if ((p)!=NULL) { \

include/mimalloc-types.h

@@ -32,6 +32,7 @@ terms of the MIT license. A copy of the license can be found in the file
 // Define MI_TRACK_<tool> to enable tracking support
 // #define MI_TRACK_VALGRIND 1
 // #define MI_TRACK_ASAN     1
+#define MI_TRACK_ETW      1
 
 // Define MI_STAT as 1 to maintain statistics; set it to 2 to have detailed statistics (but costs some performance).
 // #define MI_STAT 1
@@ -60,7 +61,7 @@ terms of the MIT license. A copy of the license can be found in the file
 
 // Reserve extra padding at the end of each block to be more resilient against heap block overflows.
 // The padding can detect buffer overflow on free.
-#if !defined(MI_PADDING) && (MI_SECURE>=3 || MI_DEBUG>=1 || MI_TRACK_VALGRIND || MI_TRACK_ASAN)
+#if !defined(MI_PADDING) && (MI_SECURE>=3 || MI_DEBUG>=1 || (MI_TRACK_VALGRIND || MI_TRACK_ASAN || MI_TRACK_ETW))
 #define MI_PADDING  1
 #endif