Changeset 180359 in webkit

Timestamp:

Feb 19, 2015 12:42:52 PM (9 years ago)

Author:

ggaren@apple.com

Message:

bmalloc should implement malloc introspection (to stop false-positive leaks when MallocStackLogging is off)
​https://bugs.webkit.org/show_bug.cgi?id=141802

Reviewed by Andreas Kling.

This patch does the bare minimum to stop false positive leaks from
being reported by the Darwin leaks tool. We register each super chunk
as a single object, and then request that the leaks tool scan it.

• bmalloc.xcodeproj/project.pbxproj: Added an abstraction for the malloc

zone introspection API.

• bmalloc/Algorithm.h: Missing #include.

• bmalloc/VMHeap.cpp:

(bmalloc::VMHeap::grow):

• bmalloc/VMHeap.h: Adopt the new abstraction.

• bmalloc/Zone.cpp: Added.

(bmalloc::remoteRead): Helper for reading an object out of another process.
(bmalloc::Zone::enumerator):
(bmalloc::Zone::Zone): Register a malloc zone so that we will participate
in introspection.

• bmalloc/Zone.h: Added.

(bmalloc::Zone::superChunks):
(bmalloc::Zone::addSuperChunk): Use a non-dynamically-allocated vector
since our dynamic allocations will not be scanned by leaks since they
will have the malloc VM tag.

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• bmalloc.xcodeproj/project.pbxproj (modified) (5 diffs)
• bmalloc/Algorithm.h (modified) (1 diff)
• bmalloc/VMHeap.cpp (modified) (1 diff)
• bmalloc/VMHeap.h (modified) (2 diffs)
• bmalloc/Zone.cpp (added)
• bmalloc/Zone.h (added)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2015-02-19  Geoffrey Garen  <ggaren@apple.com>
+
+        bmalloc should implement malloc introspection (to stop false-positive leaks when MallocStackLogging is off)
+        https://bugs.webkit.org/show_bug.cgi?id=141802
+
+        Reviewed by Andreas Kling.
+
+        This patch does the bare minimum to stop false positive leaks from
+        being reported by the Darwin leaks tool. We register each super chunk
+        as a single object, and then request that the leaks tool scan it.
+
+        * bmalloc.xcodeproj/project.pbxproj: Added an abstraction for the malloc
+        zone introspection API.
+
+        * bmalloc/Algorithm.h: Missing #include.
+
+        * bmalloc/VMHeap.cpp:
+        (bmalloc::VMHeap::grow):
+        * bmalloc/VMHeap.h: Adopt the new abstraction.
+
+        * bmalloc/Zone.cpp: Added.
+        (bmalloc::remoteRead): Helper for reading an object out of another process.
+        (bmalloc::Zone::enumerator):
+        (bmalloc::Zone::Zone): Register a malloc zone so that we will participate
+        in introspection.
+
+        * bmalloc/Zone.h: Added.
+        (bmalloc::Zone::superChunks):
+        (bmalloc::Zone::addSuperChunk): Use a non-dynamically-allocated vector
+        since our dynamic allocations will not be scanned by leaks since they
+        will have the malloc VM tag.
+
 2015-02-18  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj

@@ -17 +17 @@
                 143CB81D19022BC900B16A45 /* StaticMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 143CB81B19022BC900B16A45 /* StaticMutex.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 1440AFC91A95142400837FAA /* SuperChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 1440AFC81A95142400837FAA /* SuperChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                1440AFCB1A95261100837FAA /* Zone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1440AFCA1A95261100837FAA /* Zone.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                1440AFCD1A9527AF00837FAA /* Zone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1440AFCC1A9527AF00837FAA /* Zone.cpp */; };
                 1448C30018F3754600502839 /* mbmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1448C2FF18F3754300502839 /* mbmalloc.cpp */; };
                 1448C30118F3754C00502839 /* bmalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 1448C2FE18F3754300502839 /* bmalloc.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -93 +95 @@
                 143E29ED18CAE90500FE8A0F /* SmallPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmallPage.h; path = bmalloc/SmallPage.h; sourceTree = "<group>"; };
                 1440AFC81A95142400837FAA /* SuperChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SuperChunk.h; path = bmalloc/SuperChunk.h; sourceTree = "<group>"; };
+                1440AFCA1A95261100837FAA /* Zone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Zone.h; path = bmalloc/Zone.h; sourceTree = "<group>"; };
+                1440AFCC1A9527AF00837FAA /* Zone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Zone.cpp; path = bmalloc/Zone.cpp; sourceTree = "<group>"; };
                 144469E417A46BFE00F9EA1D /* Cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = Cache.cpp; path = bmalloc/Cache.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
                 144469E517A46BFE00F9EA1D /* Cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = Cache.h; path = bmalloc/Cache.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -261 +265 @@
                                 144F7BFB18BFC517003537F3 /* VMHeap.cpp */,
                                 144F7BFC18BFC517003537F3 /* VMHeap.h */,
+                                1440AFCA1A95261100837FAA /* Zone.h */,
+                                1440AFCC1A9527AF00837FAA /* Zone.cpp */,
                         );
                         name = heap;
@@ -306 +312 @@
                                 14DD788C18F48CAE00950702 /* LargeChunk.h in Headers */,
                                 14DD789218F48CFC00950702 /* EndTag.h in Headers */,
+                                1440AFCB1A95261100837FAA /* Zone.h in Headers */,
                                 140FA00519CE4B6800FFD3C8 /* LineMetadata.h in Headers */,
                                 14DD78CC18F48D7500950702 /* PerThread.h in Headers */,
@@ -434 +441 @@
                                 14F271C518EA397E008C152F /* Deallocator.cpp in Sources */,
                                 14F271C418EA397B008C152F /* Cache.cpp in Sources */,
+                                1440AFCD1A9527AF00837FAA /* Zone.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/bmalloc/bmalloc/Algorithm.h

@@ -28 +28 @@
 
 #include "Algorithm.h"
+#include "BAssert.h"
 #include <algorithm>
 #include <cstdint>

trunk/Source/bmalloc/bmalloc/VMHeap.cpp

@@ -41 +41 @@
 {
     SuperChunk* superChunk = SuperChunk::create();
-    m_superChunks.push(superChunk);
+#if BPLATFORM(DARWIN)
+    m_zone.addSuperChunk(superChunk);
+#endif
 
     SmallChunk* smallChunk = superChunk->smallChunk();

trunk/Source/bmalloc/bmalloc/VMHeap.h

@@ -35 +35 @@
 #include "SmallChunk.h"
 #include "Vector.h"
+#if BPLATFORM(DARWIN)
+#include "Zone.h"
+#endif
 
 namespace bmalloc {
@@ -62 +65 @@
     Vector<MediumPage*> m_mediumPages;
     SegregatedFreeList m_largeRanges;
-    Vector<SuperChunk*> m_superChunks;
+#if BPLATFORM(DARWIN)
+    Zone m_zone;
+#endif
 };