Changeset 204917 in webkit

Timestamp:

Aug 24, 2016 12:23:47 PM (8 years ago)

Author:

akling@apple.com

Message:

Source/bmalloc:
Add bmalloc::api::isEnabled().
<​https://webkit.org/b/160534>

Reviewed by Joseph Pecoraro.

• bmalloc/bmalloc.h:

(bmalloc::api::isEnabled):

Source/WebCore:
Leaks bot hits an assertion in ResourceUsageThread::platformThreadBody
<​https://webkit.org/b/160534>

Reviewed by Joseph Pecoraro.

Use the correct malloc bucket when bmalloc is disabled (which is the case on leaks bots.)

• page/cocoa/ResourceUsageThreadCocoa.mm:

(WebCore::ResourceUsageThread::platformThreadBody):

Source/WTF:
Add WTF::isFastMallocEnabled().
<​https://webkit.org/b/160534>

Reviewed by Joseph Pecoraro.

• wtf/FastMalloc.cpp:

(WTF::isFastMallocEnabled):

• wtf/FastMalloc.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FastMalloc.cpp (modified) (2 diffs)
• WTF/wtf/FastMalloc.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/cocoa/ResourceUsageThreadCocoa.mm (modified) (1 diff)
• bmalloc/ChangeLog (modified) (1 diff)
• bmalloc/bmalloc/bmalloc.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-08-24  Andreas Kling  <akling@apple.com>
+
+        Add WTF::isFastMallocEnabled().
+        <https://webkit.org/b/160534>
+
+        Reviewed by Joseph Pecoraro.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::isFastMallocEnabled):
+        * wtf/FastMalloc.h:
+
 2016-08-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/FastMalloc.cpp

@@ -82 +82 @@
 namespace WTF {
 
+bool isFastMallocEnabled()
+{
+    return false;
+}
+
 size_t fastMallocGoodSize(size_t bytes)
 {
@@ -188 +193 @@
 
 namespace WTF {
+
+bool isFastMallocEnabled()
+{
+    return bmalloc::api::isEnabled();
+}
 
 void* fastMalloc(size_t size)

trunk/Source/WTF/wtf/FastMalloc.h

@@ -38 +38 @@
     mutable void* m_data;
 };
+
+WTF_EXPORT_PRIVATE bool isFastMallocEnabled();
 
 // These functions call CRASH() if an allocation fails.
@@ -100 +102 @@
 } // namespace WTF
 
+using WTF::isFastMallocEnabled;
 using WTF::fastCalloc;
 using WTF::fastFree;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-24  Andreas Kling  <akling@apple.com>
+
+        Leaks bot hits an assertion in ResourceUsageThread::platformThreadBody
+        <https://webkit.org/b/160534>
+
+        Reviewed by Joseph Pecoraro.
+
+        Use the correct malloc bucket when bmalloc is disabled (which is the case on leaks bots.)
+
+        * page/cocoa/ResourceUsageThreadCocoa.mm:
+        (WebCore::ResourceUsageThread::platformThreadBody):
+
 2016-08-24  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm

@@ -228 +228 @@
     data.categories[MemoryCategory::GCOwned].externalSize = currentGCOwnedExternal;
 
-    // Subtract known subchunks from the bmalloc bucket.
-    // FIXME: Handle running with bmalloc disabled.
-    size_t currentGCOwnedGenerallyInBmalloc = currentGCOwnedExtra - currentGCOwnedExternal;
-    ASSERT(currentGCOwnedGenerallyInBmalloc < data.categories[MemoryCategory::bmalloc].dirtySize);
-    data.categories[MemoryCategory::bmalloc].dirtySize -= currentGCHeapCapacity + currentGCOwnedGenerallyInBmalloc;
+    // Subtract known subchunks from the appropriate malloc bucket.
+    size_t currentGCOwnedGenerallyInMalloc = currentGCOwnedExtra - currentGCOwnedExternal;
+    if (isFastMallocEnabled()) {
+        RELEASE_ASSERT(currentGCOwnedGenerallyInMalloc < data.categories[MemoryCategory::bmalloc].dirtySize);
+        data.categories[MemoryCategory::bmalloc].dirtySize -= currentGCHeapCapacity + currentGCOwnedGenerallyInMalloc;
+    } else {
+        RELEASE_ASSERT(currentGCOwnedGenerallyInMalloc < data.categories[MemoryCategory::LibcMalloc].dirtySize);
+        data.categories[MemoryCategory::LibcMalloc].dirtySize -= currentGCHeapCapacity + currentGCOwnedGenerallyInMalloc;
+    }
 
     data.totalExternalSize = currentGCOwnedExternal;

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2016-08-24  Andreas Kling  <akling@apple.com>
+
+        Add bmalloc::api::isEnabled().
+        <https://webkit.org/b/160534>
+
+        Reviewed by Joseph Pecoraro.
+
+        * bmalloc/bmalloc.h:
+        (bmalloc::api::isEnabled):
+
 2016-08-24  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/bmalloc/bmalloc/bmalloc.h

@@ -74 +74 @@
 }
 
+inline bool isEnabled()
+{
+    std::unique_lock<StaticMutex> lock(PerProcess<Heap>::mutex());
+    return PerProcess<Heap>::getFastCase()->environment().isBmallocEnabled();
+}
+
 } // namespace api
 } // namespace bmalloc