Merge pull request #1553 from filipe-norte-red/wpe-2.46-malloc-zone-heap-breakdown

[wpe-2.46] Support malloc-zone for non-Darwin OS for debug heap breakdown

Author: magomez

Source/WTF/wtf/CMakeLists.txt

@@ -742,6 +742,10 @@ if (NOT USE_SYSTEM_MALLOC)
     set(WTF_FRAMEWORKS bmalloc)
 endif ()
 
+if (ENABLE_MALLOC_HEAP_BREAKDOWN)
+    list(APPEND WTF_LIBRARIES ${MALLOC_ZONE_LIBRARIES})
+endif ()
+
 if (ATOMICS_REQUIRE_LIBATOMIC)
     list(APPEND WTF_LIBRARIES atomic)
 endif ()

Source/WTF/wtf/DebugHeap.h

@@ -30,10 +30,8 @@
 
 #if ENABLE(MALLOC_HEAP_BREAKDOWN)
 #include <mutex>
-#if OS(DARWIN)
 #include <malloc/malloc.h>
 #endif
-#endif
 
 namespace WTF {
 
@@ -53,9 +51,7 @@ class DebugHeap {
     WTF_EXPORT_PRIVATE void free(void*);
 
 private:
-#if OS(DARWIN)
     malloc_zone_t* m_zone;
-#endif
 };
 
 #define DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER_AND_EXPORT(Type, Export) \

Source/bmalloc/CMakeLists.txt

@@ -678,6 +678,12 @@ set(bmalloc_LIBRARIES
     ${CMAKE_DL_LIBS}
 )
 
+if (ENABLE_MALLOC_HEAP_BREAKDOWN)
+    list(APPEND bmalloc_LIBRARIES
+        ${MALLOC_ZONE_LIBRARIES}
+    )
+endif ()
+
 if (ATOMICS_REQUIRE_LIBATOMIC)
     list(APPEND bmalloc_LIBRARIES atomic)
 endif ()

Source/bmalloc/bmalloc/BPlatform.h

@@ -331,7 +331,9 @@
 #endif
 
 /* Enable this to put each IsoHeap and other allocation categories into their own malloc heaps, so that tools like vmmap can show how big each heap is. */
+#if !defined(BENABLE_MALLOC_HEAP_BREAKDOWN)
 #define BENABLE_MALLOC_HEAP_BREAKDOWN 0
+#endif
 
 /* This is used for debugging when hacking on how bmalloc calculates its physical footprint. */
 #define ENABLE_PHYSICAL_PAGE_MAP 0

Source/bmalloc/bmalloc/DebugHeap.cpp

@@ -42,7 +42,7 @@ DebugHeap* debugHeapCache { nullptr };
 
 DEFINE_STATIC_PER_PROCESS_STORAGE(DebugHeap);
 
-#if BOS(DARWIN)
+#if BENABLE_MALLOC_HEAP_BREAKDOWN
 
 static bool shouldUseDefaultMallocZone()
 {

Source/bmalloc/bmalloc/DebugHeap.h

@@ -32,7 +32,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#if BOS(DARWIN)
+#if BENABLE_MALLOC_HEAP_BREAKDOWN
 #include <malloc/malloc.h>
 #endif
 
@@ -67,7 +67,7 @@ class DebugHeap : private StaticPerProcess<DebugHeap> {
 private:
     static DebugHeap* tryGetSlow();
 
-#if BOS(DARWIN)
+#if BENABLE_MALLOC_HEAP_BREAKDOWN
     malloc_zone_t* m_zone;
 #endif
 

Source/bmalloc/bmalloc/IsoTLSInlines.h

@@ -33,7 +33,7 @@
 
 #if !BUSE(LIBPAS)
 
-#if BOS(DARWIN)
+#if BENABLE_MALLOC_HEAP_BREAKDOWN
 #include <malloc/malloc.h>
 #endif
 

Source/cmake/OptionsWPE.cmake

@@ -117,6 +117,9 @@ WEBKIT_OPTION_DEFINE(ENABLE_JSC_RESTRICTED_OPTIONS_BY_DEFAULT "Whether to enable
 WEBKIT_OPTION_DEFINE(USE_FLITE "Whether to use Flite library for SpeechSynthesis" PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
 WEBKIT_OPTION_DEFINE(USE_TTS_CLIENT "Whether to use TTSClient API for SpeechSynthesis" PRIVATE OFF)
 
+# Debug memory heap breakdown with malloc-zone allocator
+WEBKIT_OPTION_DEFINE(ENABLE_MALLOC_HEAP_BREAKDOWN "Whether to enable malloc heap breakdown" PRIVATE OFF)
+
 WEBKIT_OPTION_CONFLICT(ENABLE_WPE_PLATFORM ENABLE_WPE_1_1_API)
 
 WEBKIT_OPTION_DEPEND(ENABLE_DOCUMENTATION ENABLE_INTROSPECTION)
@@ -485,5 +488,16 @@ EXPOSE_STRING_VARIABLE_TO_BUILD(WPE_WEB_PROCESS_EXTENSION_PC_MODULE)
 set(WPEWebProcessExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/${WPE_WEB_PROCESS_EXTENSION_PC_MODULE}.pc)
 set(WPEWebProcessExtension_Uninstalled_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/${WPE_WEB_PROCESS_EXTENSION_PC_MODULE}-uninstalled.pc)
 
+if (ENABLE_MALLOC_HEAP_BREAKDOWN)
+    # Use same heap breakdown setting for bmalloc
+    add_definitions(-DBENABLE_MALLOC_HEAP_BREAKDOWN=1)
+
+    # Darwin OS has support for malloc zones without additional libraries. On non Darwin OS
+    # targets, the library needs to be provided if heap breakdown is enabled
+    if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        set(MALLOC_ZONE_LIBRARIES malloc-zone)
+    endif()
+endif()
+
 include(BubblewrapSandboxChecks)
 include(GStreamerChecks)