Title: [246976] releases/WebKitGTK/webkit-2.24/Source/WTF
- Revision
- 246976
- Author
- carlo...@webkit.org
- Date
- 2019-07-01 01:53:34 -0700 (Mon, 01 Jul 2019)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog (246975 => 246976)
--- releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog 2019-07-01 08:53:31 UTC (rev 246975)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog 2019-07-01 08:53:34 UTC (rev 246976)
@@ -1,3 +1,20 @@
+2019-04-21 Zan Dobersek <zdober...@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-03-16 Darin Adler <da...@apple.com>
Improve normalization code, including moving from unorm.h to unorm2.h
Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/PlatformWPE.cmake (246975 => 246976)
--- releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/PlatformWPE.cmake 2019-07-01 08:53:31 UTC (rev 246975)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/PlatformWPE.cmake 2019-07-01 08:53:34 UTC (rev 246976)
@@ -14,6 +14,7 @@
UniStdExtras.cpp
generic/MainThreadGeneric.cpp
+ generic/MemoryFootprintGeneric.cpp
generic/WorkQueueGeneric.cpp
glib/FileSystemGlib.cpp
@@ -23,7 +24,6 @@
glib/URLGLib.cpp
linux/CurrentProcessMemoryStatus.cpp
- linux/MemoryFootprintLinux.cpp
linux/MemoryPressureHandlerLinux.cpp
posix/OSAllocatorPOSIX.cpp
Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/generic/MemoryFootprintGeneric.cpp (246975 => 246976)
--- releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/generic/MemoryFootprintGeneric.cpp 2019-07-01 08:53:31 UTC (rev 246975)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/generic/MemoryFootprintGeneric.cpp 2019-07-01 08:53:34 UTC (rev 246976)
@@ -26,11 +26,19 @@
#include "config.h"
#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
}
} // namespace WTF
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
