Changeset 181215 in webkit


Ignore:
Timestamp:
Mar 7, 2015, 4:23:03 PM (10 years ago)
Author:
ggaren@apple.com
Message:

Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
​https://bugs.webkit.org/show_bug.cgi?id=140900

Reviewed by Mark Hahnenberg.

Re-landing just the removal of BlockAllocator, which is now unused.

Source/JavaScriptCore:

  • API/JSBase.cpp:
  • CMakeLists.txt:
  • JavaScriptCore.order:
  • JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
  • JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • heap/BlockAllocator.cpp: Removed.
  • heap/BlockAllocator.h: Removed.
  • heap/GCThreadSharedData.h:
  • heap/HandleBlockInlines.h:
  • heap/Heap.cpp:

(JSC::Heap::Heap):

  • heap/Heap.h:
  • heap/HeapInlines.h:

(JSC::Heap::blockAllocator): Deleted.

  • heap/HeapTimer.cpp:
  • heap/MarkedBlock.h:
  • heap/MarkedSpace.h:
  • heap/Region.h: Removed.
  • heap/SuperRegion.cpp: Removed.
  • heap/SuperRegion.h: Removed.

Source/WebCore:

  • platform/cocoa/MemoryPressureHandlerCocoa.mm:

(WebCore::MemoryPressureHandler::install):

Location:
trunk/Source
Files:
5 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSBase.cpp

    r179211 r181215  
    3131#include "CallFrame.h"
    3232#include "Completion.h"
     33#include "GCActivityCallback.h"
    3334#include "InitializeThreading.h"
    3435#include "JSGlobalObject.h"

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r181084 r181215  
    248248    disassembler/X86Disassembler.cpp
    249249
    250     heap/BlockAllocator.cpp
    251250    heap/CodeBlockSet.cpp
    252251    heap/ConservativeRoots.cpp
    … …  
    274273    heap/MarkedSpace.cpp
    275274    heap/SlotVisitor.cpp
    276     heap/SuperRegion.cpp
    277275    heap/Weak.cpp
    278276    heap/WeakBlock.cpp

  • trunk/Source/JavaScriptCore/ChangeLog

    r181214 r181215  
     12015-03-07  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
     4        https://bugs.webkit.org/show_bug.cgi?id=140900
     5
     6        Reviewed by Mark Hahnenberg.
     7
     8        Re-landing just the removal of BlockAllocator, which is now unused.
     9
     10        * API/JSBase.cpp:
     11        * CMakeLists.txt:
     12        * JavaScriptCore.order:
     13        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
     14        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
     15        * JavaScriptCore.xcodeproj/project.pbxproj:
     16        * heap/BlockAllocator.cpp: Removed.
     17        * heap/BlockAllocator.h: Removed.
     18        * heap/GCThreadSharedData.h:
     19        * heap/HandleBlockInlines.h:
     20        * heap/Heap.cpp:
     21        (JSC::Heap::Heap):
     22        * heap/Heap.h:
     23        * heap/HeapInlines.h:
     24        (JSC::Heap::blockAllocator): Deleted.
     25        * heap/HeapTimer.cpp:
     26        * heap/MarkedBlock.h:
     27        * heap/MarkedSpace.h:
     28        * heap/Region.h: Removed.
     29        * heap/SuperRegion.cpp: Removed.
     30        * heap/SuperRegion.h: Removed.
     31
    1322015-03-07  Commit Queue  <commit-queue@webkit.org>
    233

  • trunk/Source/JavaScriptCore/JavaScriptCore.order

    r180587 r181215  
    174174__ZN3JSC4HeapC2EPNS_2VMENS_8HeapTypeE
    175175__ZN3WTF7ramSizeEv
    176 __ZN3JSC14BlockAllocatorC1Ev
    177176__ZN3JSC11SuperRegionC1Ev
    178177__ZN3JSC11MarkedSpaceC1EPNS_4HeapE
    … …  
    181180__ZN3JSC14MachineThreadsC1EPNS_4HeapE
    182181__ZN3JSC18GCThreadSharedDataC1EPNS_2VME
    183 __ZN3JSC14BlockAllocator27blockFreeingThreadStartFuncEPv
    184182__ZN3JSC18GCThreadSharedDataC2EPNS_2VME
    185 __ZN3JSC14MarkStackArrayC1ERNS_14BlockAllocatorE
    186 __ZN3JSC14BlockAllocator22blockFreeingThreadMainEv
    187 __ZN3JSC14BlockAllocator8allocateINS_16MarkStackSegmentEEEPNS_9DeadBlockEv
    188183__ZN3WTF15ThreadCondition9timedWaitERNS_5MutexEd
    189 __ZN3JSC14BlockAllocator21tryAllocateFromRegionERNS0_9RegionSetERN3WTF16DoublyLinkedListINS_6RegionEEERm
    190184__ZN3WTF21PageAllocationAligned8allocateEmmNS_11OSAllocator5UsageEb
    191185__ZN3JSC11SlotVisitorC1ERNS_18GCThreadSharedDataE
    … …  
    199193__ZN3JSC8GCThread16waitForNextPhaseEv
    200194__ZN3JSC9HandleSetC1EPNS_2VME
    201 __ZN3JSC14BlockAllocator8allocateINS_11HandleBlockEEEPNS_9DeadBlockEv
    202195__ZN3JSC11HandleStackC1Ev
    203196__ZN3WTF10BlockStackIN3JSC7JSValueEE4growEv
    … …  
    211204__ZN3JSC11CopiedSpace4initEv
    212205__ZN3JSC11CopiedSpace13allocateBlockEv
    213 __ZN3JSC14BlockAllocator8allocateINS_11CopiedBlockEEEPNS_9DeadBlockEv
    214206__ZN3WTF9HashTableIPN3JSC11CopiedBlockES3_NS_17IdentityExtractorENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES8_E3addINS_22IdentityHashTranslatorIS6_EES3_S3_EENS_18HashTableAddResultINS_17HashTableIteratorIS3_S3_S4_S6_S8_S8_EEEERKT0_RKT1_
    215207__ZN3JSC8WatchdogC1Ev
    … …  
    234226__ZN3JSC25DefaultGCActivityCallback11didAllocateEm
    235227__ZN3JSC15MarkedAllocator13allocateBlockEm
    236 __ZN3JSC14BlockAllocator8allocateINS_11MarkedBlockEEEPNS_9DeadBlockEv
    237228__ZN3JSC11MarkedBlock6createEPNS_9DeadBlockEPNS_15MarkedAllocatorEmNS0_14DestructorTypeE
    238229__ZN3JSC11MarkedBlock5sweepENS0_9SweepModeE
    … …  
    286277__ZN3JSC24StructureTransitionTable3addERNS_2VMEPNS_9StructureE
    287278__ZN3JSC7WeakSet13findAllocatorEv
    288 __ZN3JSC14BlockAllocator8allocateINS_9WeakBlockEEEPNS_9DeadBlockEv
    289279__ZN3JSC9WeakBlock6createEPNS_9DeadBlockE
    290280__ZN3JSC8JSObject43setStructureAndReallocateStorageIfNecessaryERNS_2VMEPNS_9StructureE
    … …  
    554544__ZN3JSC7JSScope13visitChildrenEPNS_6JSCellERNS_11SlotVisitorE
    555545__ZN3JSC11CopiedBlock15reportLiveBytesEPNS_6JSCellEj
    556 __ZN3JSC14BlockAllocator8allocateINS_19CopyWorkListSegmentEEEPNS_9DeadBlockEv
    557546__ZN3JSC13PropertyTable13visitChildrenEPNS_6JSCellERNS_11SlotVisitorE
    558547__ZN3JSC12RegExpObject13visitChildrenEPNS_6JSCellERNS_11SlotVisitorE
    … …  
    591580__ZN3JSC11MarkedSpace12forEachBlockINS_8CapacityEEENT_10ReturnTypeERS3_
    592581__ZN3JSC11CopiedSpace11doneCopyingEv
    593 __ZN3JSC14BlockAllocator10deallocateINS_9HeapBlockINS_19CopyWorkListSegmentEEEEEvPT_
    594582__ZN3JSC11SlotVisitor31finalizeUnconditionalFinalizersEv
    595583__ZN3JSC12SmallStrings20finalizeSmallStringsEv
    … …  
    10491037__ZN3WTF7HashSetIPN3JSC11CopiedBlockENS_7PtrHashIS3_EENS_10HashTraitsIS3_EEE6removeERKS3_
    10501038__ZN3WTF7HashSetIPN3JSC11CopiedBlockENS_7PtrHashIS3_EENS_10HashTraitsIS3_EEE6removeENS_29HashTableConstIteratorAdapterINS_9HashTableIS3_S3_NS_17IdentityExtractorES5_S7_S7_EES3_EE
    1051 __ZN3JSC14BlockAllocator10deallocateINS_9HeapBlockINS_11CopiedBlockEEEEEvPT_
    10521039__ZN3WTF13StringBuilder6appendEPKtj
    10531040__ZN3JSC24UnlinkedProgramCodeBlock13visitChildrenEPNS_6JSCellERNS_11SlotVisitorE
    … …  
    26242611__ZN3JSC18RegExpMatchesArray13visitChildrenEPNS_6JSCellERNS_11SlotVisitorE
    26252612__ZN3WTF9HashTableIPvS1_NS_17IdentityExtractorENS_7PtrHashIS1_EENS_10HashTraitsIS1_EES6_E16lookupForWritingINS_22IdentityHashTranslatorIS4_EES1_EENSt3__14pairIPS1_bEERKT0_
    2626 __ZN3JSC14BlockAllocator10deallocateINS_9HeapBlockINS_16MarkStackSegmentEEEEEvPT_
    26272613__ZThn16_N3JSC9CodeBlock19visitWeakReferencesERNS_11SlotVisitorE
    26282614__ZN3JSC9CodeBlock23finalizeUnconditionallyEv
    … …  
    28842870__ZN3WTF7HashSetIPN3JSC11MarkedBlockENS_15MarkedBlockHashENS_10HashTraitsIS3_EEE6removeERKS3_
    28852871__ZN3JSC7WeakSetD1Ev
    2886 __ZN3JSC14BlockAllocator10deallocateINS_9HeapBlockINS_11MarkedBlockEEEEEvPT_
    28872872__ZN3JSC16NativeExecutable7destroyEPNS_6JSCellE
    28882873__ZN3JSC11RegExpCache8finalizeENS_6HandleINS_7UnknownEEEPv
    … …  
    28902875__ZN3JSC6RegExp7destroyEPNS_6JSCellE
    28912876__ZN3JSC4Yarr13YarrCodeBlockD2Ev
    2892 __ZN3JSC14BlockAllocator10deallocateINS_9HeapBlockINS_9WeakBlockEEEEEvPT_
    28932877__ZN3JSC17RegExpConstructor7destroyEPNS_6JSCellE
    28942878__ZN3JSC4Heap14FinalizerOwner8finalizeENS_6HandleINS_7UnknownEEEPv
    … …  
    45344518__ZN3JSC13DFGCodeBlocksD2Ev
    45354519__ZN3JSC9HandleSetD1Ev
    4536 __ZN3JSC14BlockAllocator10deallocateINS_9HeapBlockINS_11HandleBlockEEEEEvPT_
    45374520__ZN3JSC11SlotVisitorD1Ev
    45384521__ZN3JSC14MarkStackArrayD1Ev
    … …  
    45464529__ZN3JSC11MarkedSpaceD1Ev
    45474530__ZN3JSC11MarkedSpace12forEachBlockINS_4FreeEEENT_10ReturnTypeERS3_
    4548 __ZN3JSC14BlockAllocatorD1Ev
    4549 __ZN3JSC14BlockAllocator18releaseFreeRegionsEv
    45504531__ZN3JSC11SuperRegionD1Ev
    45514532__ZN3WTF13MetaAllocatorD2Ev

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

    r181084 r181215  
    532532    <ClCompile Include="..\ftl\FTLValueFormat.cpp" />
    533533    <ClCompile Include="..\ftl\FTLValueRange.cpp" />
    534     <ClCompile Include="..\heap\BlockAllocator.cpp" />
    535534    <ClCompile Include="..\heap\CodeBlockSet.cpp" />
    536535    <ClCompile Include="..\heap\ConservativeRoots.cpp" />
    … …  
    558557    <ClCompile Include="..\heap\MarkStack.cpp" />
    559558    <ClCompile Include="..\heap\SlotVisitor.cpp" />
    560     <ClCompile Include="..\heap\SuperRegion.cpp" />
    561559    <ClCompile Include="..\heap\Weak.cpp" />
    562560    <ClCompile Include="..\heap\WeakBlock.cpp" />
    … …  
    12311229    <ClInclude Include="..\ftl\FTLWeight.h" />
    12321230    <ClInclude Include="..\ftl\FTLWeightedTarget.h" />
    1233     <ClInclude Include="..\heap\BlockAllocator.h" />
    12341231    <ClInclude Include="..\heap\CodeBlockSet.h" />
    12351232    <ClInclude Include="..\heap\ConservativeRoots.h" />
    … …  
    12801277    <ClInclude Include="..\heap\MarkStack.h" />
    12811278    <ClInclude Include="..\heap\RecursiveAllocationScope.h" />
    1282     <ClInclude Include="..\heap\Region.h" />
    12831279    <ClInclude Include="..\heap\SlotVisitor.h" />
    12841280    <ClInclude Include="..\heap\SlotVisitorInlines.h" />
    12851281    <ClInclude Include="..\heap\Strong.h" />
    12861282    <ClInclude Include="..\heap\StrongInlines.h" />
    1287     <ClInclude Include="..\heap\SuperRegion.h" />
    12881283    <ClInclude Include="..\heap\TinyBloomFilter.h" />
    12891284    <ClInclude Include="..\heap\UnconditionalFinalizer.h" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

    r181084 r181215  
    238238      <Filter>disassembler</Filter>
    239239    </ClCompile>
    240     <ClCompile Include="..\heap\BlockAllocator.cpp">
    241       <Filter>heap</Filter>
    242     </ClCompile>
    243240    <ClCompile Include="..\heap\ConservativeRoots.cpp">
    244241      <Filter>heap</Filter>
    … …  
    308305    </ClCompile>
    309306    <ClCompile Include="..\heap\SlotVisitor.cpp">
    310       <Filter>heap</Filter>
    311     </ClCompile>
    312     <ClCompile Include="..\heap\SuperRegion.cpp">
    313307      <Filter>heap</Filter>
    314308    </ClCompile>
    … …  
    20742068      <Filter>disassembler</Filter>
    20752069    </ClInclude>
    2076     <ClInclude Include="..\heap\BlockAllocator.h">
    2077       <Filter>heap</Filter>
    2078     </ClInclude>
    20792070    <ClInclude Include="..\heap\ConservativeRoots.h">
    20802071      <Filter>heap</Filter>
    … …  
    22152206      <Filter>heap</Filter>
    22162207    </ClInclude>
    2217     <ClInclude Include="..\heap\Region.h">
    2218       <Filter>heap</Filter>
    2219     </ClInclude>
    22202208    <ClInclude Include="..\heap\SlotVisitor.h">
    22212209      <Filter>heap</Filter>
    … …  
    22282216    </ClInclude>
    22292217    <ClInclude Include="..\heap\StrongInlines.h">
    2230       <Filter>heap</Filter>
    2231     </ClInclude>
    2232     <ClInclude Include="..\heap\SuperRegion.h">
    22332218      <Filter>heap</Filter>
    22342219    </ClInclude>

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r181214 r181215  
    826826                147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* JSCJSValue.cpp */; };
    827827                147F39D7107EC37600427A48 /* JSEnvironmentRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22A39A0E16E14800AF21C8 /* JSEnvironmentRecord.cpp */; };
    828                 14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14816E19154CC56C00B8054C /* BlockAllocator.cpp */; };
    829                 14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 14816E1A154CC56C00B8054C /* BlockAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    830828                1482B74E0A43032800517CFC /* JSStringRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1482B74C0A43032800517CFC /* JSStringRef.cpp */; };
    831829                1482B7E40A43076000517CFC /* JSObjectRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1482B7E20A43076000517CFC /* JSObjectRef.cpp */; };
    … …  
    15451543                BCFD8C930EEB2EE700283848 /* JumpTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFD8C910EEB2EE700283848 /* JumpTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15461544                C20328201981979D0088B499 /* CustomGlobalObjectClassTest.c in Sources */ = {isa = PBXBuildFile; fileRef = C203281E1981979D0088B499 /* CustomGlobalObjectClassTest.c */; };
    1547                 C20B25991706536200C21F4E /* Region.h in Headers */ = {isa = PBXBuildFile; fileRef = C20B25981706536200C21F4E /* Region.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15481545                C20BA92D16BB1C1500B3AEA2 /* StructureRareDataInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = C20BA92C16BB1C1500B3AEA2 /* StructureRareDataInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15491546                C21122E115DD9AB300790E3A /* GCThreadSharedData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C21122DE15DD9AB300790E3A /* GCThreadSharedData.cpp */; };
    … …  
    15861583                C2CF39C216E15A8100DD69BE /* JSAPIWrapperObject.h in Headers */ = {isa = PBXBuildFile; fileRef = C2CF39C016E15A8100DD69BE /* JSAPIWrapperObject.h */; };
    15871584                C2DA778318E259990066FCB6 /* HeapInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = C2DA778218E259990066FCB6 /* HeapInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1588                 C2DF442F1707AC0100A5CA96 /* SuperRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2DF442D1707AC0100A5CA96 /* SuperRegion.cpp */; };
    1589                 C2DF44301707AC0100A5CA96 /* SuperRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = C2DF442E1707AC0100A5CA96 /* SuperRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15901585                C2E526BD1590EF000054E48D /* HeapTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2E526BB1590EF000054E48D /* HeapTimer.cpp */; };
    15911586                C2E526BE1590EF000054E48D /* HeapTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = C2E526BC1590EF000054E48D /* HeapTimer.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    24632458                147B84620E6DE6B1004775A4 /* PutPropertySlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PutPropertySlot.h; sourceTree = "<group>"; };
    24642459                1480DB9B0DDC227F003CFDF2 /* DebuggerCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerCallFrame.h; sourceTree = "<group>"; };
    2465                 14816E19154CC56C00B8054C /* BlockAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlockAllocator.cpp; sourceTree = "<group>"; };
    2466                 14816E1A154CC56C00B8054C /* BlockAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockAllocator.h; sourceTree = "<group>"; };
    24672460                1482B6EA0A4300B300517CFC /* JSValueRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueRef.h; sourceTree = "<group>"; };
    24682461                1482B74B0A43032800517CFC /* JSStringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringRef.h; sourceTree = "<group>"; };
    … …  
    32503243                C203281E1981979D0088B499 /* CustomGlobalObjectClassTest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CustomGlobalObjectClassTest.c; path = API/tests/CustomGlobalObjectClassTest.c; sourceTree = "<group>"; };
    32513244                C203281F1981979D0088B499 /* CustomGlobalObjectClassTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomGlobalObjectClassTest.h; path = API/tests/CustomGlobalObjectClassTest.h; sourceTree = "<group>"; };
    3252                 C20B25981706536200C21F4E /* Region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Region.h; sourceTree = "<group>"; };
    32533245                C20BA92C16BB1C1500B3AEA2 /* StructureRareDataInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureRareDataInlines.h; sourceTree = "<group>"; };
    32543246                C21122DE15DD9AB300790E3A /* GCThreadSharedData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCThreadSharedData.cpp; sourceTree = "<group>"; };
    … …  
    32933285                C2CF39C016E15A8100DD69BE /* JSAPIWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAPIWrapperObject.h; sourceTree = "<group>"; };
    32943286                C2DA778218E259990066FCB6 /* HeapInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapInlines.h; sourceTree = "<group>"; };
    3295                 C2DF442D1707AC0100A5CA96 /* SuperRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SuperRegion.cpp; sourceTree = "<group>"; };
    3296                 C2DF442E1707AC0100A5CA96 /* SuperRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SuperRegion.h; sourceTree = "<group>"; };
    32973287                C2E526BB1590EF000054E48D /* HeapTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeapTimer.cpp; sourceTree = "<group>"; };
    32983288                C2E526BC1590EF000054E48D /* HeapTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapTimer.h; sourceTree = "<group>"; };
    … …  
    38853875                                2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */,
    38863876                                2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */,
    3887                                 14816E19154CC56C00B8054C /* BlockAllocator.cpp */,
    3888                                 14816E1A154CC56C00B8054C /* BlockAllocator.h */,
    38893877                                0FD8A31117D4326C00CA2C40 /* CodeBlockSet.cpp */,
    38903878                                0FD8A31217D4326C00CA2C40 /* CodeBlockSet.h */,
    … …  
    39533941                                142D6F0F13539A4100B02E86 /* MarkStack.h */,
    39543942                                2AAD964918569417001F93BE /* RecursiveAllocationScope.h */,
    3955                                 C20B25981706536200C21F4E /* Region.h */,
    39563943                                C225494215F7DBAA0065E898 /* SlotVisitor.cpp */,
    39573944                                14BA78F013AAB88F005B7C2C /* SlotVisitor.h */,
    … …  
    39593946                                142E3132134FF0A600AFADB5 /* Strong.h */,
    39603947                                145722851437E140005FDE26 /* StrongInlines.h */,
    3961                                 C2DF442D1707AC0100A5CA96 /* SuperRegion.cpp */,
    3962                                 C2DF442E1707AC0100A5CA96 /* SuperRegion.h */,
    39633948                                141448CC13A1783700F5BA1A /* TinyBloomFilter.h */,
    39643949                                0F5F08CE146C762F000472A9 /* UnconditionalFinalizer.h */,
    … …  
    55295514                                A784A26111D16622005776AC /* ASTBuilder.h in Headers */,
    55305515                                866739D213BFDE710023D87C /* BigInteger.h in Headers */,
    5531                                 14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */,
    55325516                                BC18C3EC0E16F5CD00B34460 /* BooleanObject.h in Headers */,
    55335517                                FEA08620182B7A0400F6D851 /* Breakpoint.h in Headers */,
    … …  
    62126196                                BC18C52C0E16FCD200B34460 /* RegExpObject.lut.h in Headers */,
    62136197                                BCD202C40E1706A7002C7E82 /* RegExpPrototype.h in Headers */,
    6214                                 C20B25991706536200C21F4E /* Region.h in Headers */,
    62156198                                BC18C45D0E16F5CD00B34460 /* Register.h in Headers */,
    62166199                                969A072B0ED1CE6900F1F681 /* RegisterID.h in Headers */,
    … …  
    62866269                                BCCF0D080EF0AAB900413C8F /* StructureStubInfo.h in Headers */,
    62876270                                BC9041480EB9250900FE26FA /* StructureTransitionTable.h in Headers */,
    6288                                 C2DF44301707AC0100A5CA96 /* SuperRegion.h in Headers */,
    62896271                                705B41AC1A6E501E00716757 /* Symbol.h in Headers */,
    62906272                                705B41AE1A6E501E00716757 /* SymbolConstructor.h in Headers */,
    … …  
    68426824                                147F39C0107EC37600427A48 /* ArrayPrototype.cpp in Sources */,
    68436825                                0F24E54017EA9F5900ABB217 /* AssemblyHelpers.cpp in Sources */,
    6844                                 14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */,
    68456826                                0F69CC88193AC60A0045759E /* DFGFrozenValue.cpp in Sources */,
    68466827                                14280863107EC11A0013E7B2 /* BooleanConstructor.cpp in Sources */,
    … …  
    73707351                                0F766D3815AE4A1C008F363E /* StructureStubClearingWatchpoint.cpp in Sources */,
    73717352                                BCCF0D0C0EF0B8A500413C8F /* StructureStubInfo.cpp in Sources */,
    7372                                 C2DF442F1707AC0100A5CA96 /* SuperRegion.cpp in Sources */,
    73737353                                705B41AB1A6E501E00716757 /* Symbol.cpp in Sources */,
    73747354                                705B41AD1A6E501E00716757 /* SymbolConstructor.cpp in Sources */,

  • trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h

    r179211 r181215  
    3939namespace JSC {
    4040
     41class CopiedBlock;
     42class CopiedSpace;
     43class CopyVisitor;
    4144class GCThread;
    4245class VM;
    43 class CopiedSpace;
    44 class CopyVisitor;
    4546
    4647enum GCPhase {

  • trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h

    r179500 r181215  
    2727#define HandleBlockInlines_h
    2828
    29 #include "BlockAllocator.h"
    3029#include "HandleBlock.h"
    3130#include <wtf/FastMalloc.h>

  • trunk/Source/JavaScriptCore/heap/Heap.cpp

    r181214 r181215  
    308308    , m_totalBytesCopied(0)
    309309    , m_operationInProgress(NoOperation)
    310     , m_blockAllocator()
    311310    , m_objectSpace(this)
    312311    , m_storageSpace(this)

  • trunk/Source/JavaScriptCore/heap/Heap.h

    r181214 r181215  
    2424
    2525#include "ArrayBuffer.h"
    26 #include "BlockAllocator.h"
    2726#include "CodeBlockSet.h"
    2827#include "CopyVisitor.h"
    … …  
    219218    bool isDeferred() const { return !!m_deferralDepth || Options::disableGC(); }
    220219
    221     BlockAllocator& blockAllocator();
    222220    StructureIDTable& structureIDTable() { return m_structureIDTable; }
    223221
    … …  
    348346   
    349347    HeapOperation m_operationInProgress;
    350     BlockAllocator m_blockAllocator;
    351348    StructureIDTable m_structureIDTable;
    352349    MarkedSpace m_objectSpace;

  • trunk/Source/JavaScriptCore/heap/HeapInlines.h

    r181214 r181215  
    271271}
    272272
    273 inline BlockAllocator& Heap::blockAllocator()
    274 {
    275     return m_blockAllocator;
    276 }
    277 
    278273#if USE(CF)
    279274template <typename T>

  • trunk/Source/JavaScriptCore/heap/HeapTimer.cpp

    r179211 r181215  
    2727#include "HeapTimer.h"
    2828
     29#include "GCActivityCallback.h"
    2930#include "IncrementalSweeper.h"
    3031#include "JSObject.h"

  • trunk/Source/JavaScriptCore/heap/MarkedBlock.h

    r181210 r181215  
    2323#define MarkedBlock_h
    2424
    25 #include "BlockAllocator.h"
    2625#include "HeapBlock.h"
    2726

  • trunk/Source/JavaScriptCore/heap/MarkedSpace.h

    r179728 r181215  
    3333#include <wtf/HashSet.h>
    3434#include <wtf/Noncopyable.h>
     35#include <wtf/RetainPtr.h>
    3536#include <wtf/Vector.h>
    3637

  • trunk/Source/WebCore/ChangeLog

    r181214 r181215  
     12015-03-07  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
     4        https://bugs.webkit.org/show_bug.cgi?id=140900
     5
     6        Reviewed by Mark Hahnenberg.
     7
     8        Re-landing just the removal of BlockAllocator, which is now unused.
     9
     10        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
     11        (WebCore::MemoryPressureHandler::install):
     12
    1132015-03-07  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm

    r180847 r181215  
    153153        gcController().garbageCollectNow();
    154154
    155         // Release any freed up blocks from the JS heap back to the system.
    156         JSDOMWindowBase::commonVM().heap.blockAllocator().releaseFreeRegions();
    157 
    158155        WTF::releaseFastMallocFreeMemory();
    159156
Note: See TracChangeset for help on using the changeset viewer.