Changeset 244496 in webkit

Timestamp:

Apr 21, 2019 11:22:59 PM (5 years ago)

Author:

zandobersek@gmail.com

Message:

[WTF] Generic memoryFootprint() implementation should use bmalloc on Linux
​https://bugs.webkit.org/show_bug.cgi?id=196963

Reviewed by Don Olmstead.

Have the generic memoryFootprint() implementation use bmalloc's
memoryFootprint() API on Linux, whenever the system malloc option is
not enabled. Limitation to Linux platforms is due to the bmalloc
implementation being limited to those configurations (excluding iOS
which doesn't use MemoryFootprintGeneric.cpp).

• wtf/PlatformWPE.cmake: Switch to building MemoryFootprintGeneric.cpp.
• wtf/generic/MemoryFootprintGeneric.cpp:

(WTF::memoryFootprint):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/PlatformWPE.cmake (modified) (2 diffs)
• wtf/generic/MemoryFootprintGeneric.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-04-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [WTF] Generic memoryFootprint() implementation should use bmalloc on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=196963
+
+        Reviewed by Don Olmstead.
+
+        Have the generic memoryFootprint() implementation use bmalloc's
+        memoryFootprint() API on Linux, whenever the system malloc option is
+        not enabled. Limitation to Linux platforms is due to the bmalloc
+        implementation being limited to those configurations (excluding iOS
+        which doesn't use MemoryFootprintGeneric.cpp).
+
+        * wtf/PlatformWPE.cmake: Switch to building MemoryFootprintGeneric.cpp.
+        * wtf/generic/MemoryFootprintGeneric.cpp:
+        (WTF::memoryFootprint):
+
 2019-04-19  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WTF/wtf/PlatformWPE.cmake

@@ -15 +15 @@
 
     generic/MainThreadGeneric.cpp
+    generic/MemoryFootprintGeneric.cpp
     generic/WorkQueueGeneric.cpp
 
@@ -24 +25 @@
 
     linux/CurrentProcessMemoryStatus.cpp
-    linux/MemoryFootprintLinux.cpp
     linux/MemoryPressureHandlerLinux.cpp
 

trunk/Source/WTF/wtf/generic/MemoryFootprintGeneric.cpp

@@ -27 +27 @@
 #include <wtf/MemoryFootprint.h>
 
+#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && OS(LINUX)
+#include <bmalloc/bmalloc.h>
+#endif
+
 namespace WTF {
 
 size_t memoryFootprint()
 {
+#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && OS(LINUX)
+    return bmalloc::api::memoryFootprint();
+#else
     return 0;
+#endif
 }