Title: [180604] trunk/Source/bmalloc
- Revision
- 180604
- Author
- sle...@apple.com
- Date
- 2015-02-24 19:02:26 -0800 (Tue, 24 Feb 2015)
Log Message
Rolling out http://trac.webkit.org/changeset/180430 as it causes the PLT to crash.
<rdar://problem/19948015>
Unreviewed.
* bmalloc/VMHeap.cpp:
(bmalloc::VMHeap::grow):
* bmalloc/VMHeap.h:
* bmalloc/Zone.cpp:
(bmalloc::Zone::Zone):
(bmalloc::Zone::size): Deleted.
* bmalloc/Zone.h:
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (180603 => 180604)
--- trunk/Source/bmalloc/ChangeLog 2015-02-25 02:31:22 UTC (rev 180603)
+++ trunk/Source/bmalloc/ChangeLog 2015-02-25 03:02:26 UTC (rev 180604)
@@ -1,3 +1,18 @@
+2015-02-24 Stephanie Lewis <sle...@apple.com>
+
+ Rolling out http://trac.webkit.org/changeset/180430 as it causes the PLT to crash.
+ <rdar://problem/19948015>
+
+ Unreviewed.
+
+ * bmalloc/VMHeap.cpp:
+ (bmalloc::VMHeap::grow):
+ * bmalloc/VMHeap.h:
+ * bmalloc/Zone.cpp:
+ (bmalloc::Zone::Zone):
+ (bmalloc::Zone::size): Deleted.
+ * bmalloc/Zone.h:
+
2015-02-24 Geoffrey Garen <gga...@apple.com>
bmalloc: Added a little more abstraction for large objects
Modified: trunk/Source/bmalloc/bmalloc/VMHeap.cpp (180603 => 180604)
--- trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2015-02-25 02:31:22 UTC (rev 180603)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2015-02-25 03:02:26 UTC (rev 180604)
@@ -40,7 +40,7 @@
void VMHeap::grow()
{
SuperChunk* superChunk = SuperChunk::create();
-#if BOS(DARWIN)
+#if BPLATFORM(DARWIN)
m_zone.addSuperChunk(superChunk);
#endif
Modified: trunk/Source/bmalloc/bmalloc/VMHeap.h (180603 => 180604)
--- trunk/Source/bmalloc/bmalloc/VMHeap.h 2015-02-25 02:31:22 UTC (rev 180603)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.h 2015-02-25 03:02:26 UTC (rev 180604)
@@ -35,7 +35,7 @@
#include "SegregatedFreeList.h"
#include "SmallChunk.h"
#include "Vector.h"
-#if BOS(DARWIN)
+#if BPLATFORM(DARWIN)
#include "Zone.h"
#endif
@@ -65,7 +65,7 @@
Vector<SmallPage*> m_smallPages;
Vector<MediumPage*> m_mediumPages;
SegregatedFreeList m_largeObjects;
-#if BOS(DARWIN)
+#if BPLATFORM(DARWIN)
Zone m_zone;
#endif
};
Modified: trunk/Source/bmalloc/bmalloc/Zone.cpp (180603 => 180604)
--- trunk/Source/bmalloc/bmalloc/Zone.cpp 2015-02-25 02:31:22 UTC (rev 180603)
+++ trunk/Source/bmalloc/bmalloc/Zone.cpp 2015-02-25 03:02:26 UTC (rev 180604)
@@ -42,13 +42,6 @@
memcpy(&result, tmp, sizeof(T));
}
-// Support malloc_zone_from_ptr, which calls size() on each registered zone.
-size_t Zone::size(malloc_zone_t*, const void*)
-{
- // Our zone is not public API, so no pointer can belong to us.
- return 0;
-}
-
// This function runs inside the leaks process.
kern_return_t Zone::enumerator(task_t task, void* context, unsigned type_mask, vm_address_t zone_address, memory_reader_t reader, vm_range_recorder_t recorder)
{
@@ -70,10 +63,9 @@
Zone::Zone()
{
- malloc_zone_t::size = size;
- malloc_zone_t::zone_name = "WebKit Malloc";
- malloc_zone_t::introspect = &bmalloc::introspect;
- malloc_zone_t::version = 4;
+ version = 4;
+ zone_name = "WebKit Malloc";
+ introspect = &bmalloc::introspect;
malloc_zone_register(this);
}
Modified: trunk/Source/bmalloc/bmalloc/Zone.h (180603 => 180604)
--- trunk/Source/bmalloc/bmalloc/Zone.h 2015-02-25 02:31:22 UTC (rev 180603)
+++ trunk/Source/bmalloc/bmalloc/Zone.h 2015-02-25 03:02:26 UTC (rev 180604)
@@ -38,7 +38,6 @@
// Enough capacity to track a 64GB heap, so probably enough for anything.
static const size_t capacity = 2048;
- static size_t size(malloc_zone_t*, const void*);
static kern_return_t enumerator(task_t, void* context, unsigned type_mask, vm_address_t, memory_reader_t, vm_range_recorder_t);
Zone();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
