2011-01-13 Geoffrey Garen <ggaren@apple.com>
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Jan 2011 01:43:29 +0000 (01:43 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Jan 2011 01:43:29 +0000 (01:43 +0000)
commit7c622bc0126583770b5ace0ac6716a748b1c2363
tree8e37573cdd637d2df95c94e8a2757d2c444df029
parent198efcf74731b14bc05c6c0aff64b2979cb437ff
2011-01-13  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Oliver Hunt.

        Split out a MarkedSpace strategy object from Heap.
        https://bugs.webkit.org/show_bug.cgi?id=52421

        * Misc/WebCoreStatistics.mm:
        (+[WebCoreStatistics memoryStatistics]): Updated for class move.
2011-01-13  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Oliver Hunt.

        Split out a MarkedSpace strategy object from Heap.
        https://bugs.webkit.org/show_bug.cgi?id=52421

        SunSpider reports no change.

        * Android.mk:
        * CMakeLists.txt:
        * GNUmakefile.am:
        * JavaScriptCore.gypi:
        * JavaScriptCore.pro:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj: Updated our 7 build systems. Which is cool.

        * runtime/Heap.cpp:
        (JSC::Heap::Heap):
        (JSC::Heap::destroy):
        (JSC::Heap::recordExtraCost):
        (JSC::Heap::allocate):
        (JSC::Heap::markConservatively):
        (JSC::Heap::markRoots):
        (JSC::Heap::objectCount):
        (JSC::Heap::statistics):
        (JSC::Heap::size):
        (JSC::Heap::isBusy):
        (JSC::Heap::collectAllGarbage):
        (JSC::Heap::primaryHeapBegin):
        (JSC::Heap::primaryHeapEnd):
        * runtime/Heap.h:
        (JSC::Heap::globalData):
        (JSC::Heap::markedSpace):
        (JSC::Heap::isCellMarked):
        (JSC::Heap::checkMarkCell):
        (JSC::Heap::markCell): Moved all code pertaining to managing chunks of
        collector memory out of this class. Heap now just delegates to MarkedSpace.

        * runtime/JSCell.h:
        (JSC::JSCell::Heap::heap): Updated for MarkedSpace delegation.

        * runtime/JSValue.h: Moved the ValueStringPair typedef to help with #includes.

        * runtime/MarkedSpace.cpp: Copied from runtime/Heap.cpp.
        (JSC::MarkedSpace::MarkedSpace):
        (JSC::MarkedSpace::destroy):
        (JSC::MarkedSpace::allocateBlock):
        (JSC::MarkedSpace::freeBlock):
        (JSC::MarkedSpace::allocate):
        (JSC::MarkedSpace::resizeBlocks):
        (JSC::MarkedSpace::growBlocks):
        (JSC::MarkedSpace::shrinkBlocks):
        (JSC::MarkedSpace::markConservatively):
        (JSC::MarkedSpace::clearMarkBits):
        (JSC::MarkedSpace::markedCells):
        (JSC::MarkedSpace::sweep):
        (JSC::MarkedSpace::objectCount):
        (JSC::MarkedSpace::addToStatistics):
        (JSC::MarkedSpace::statistics):
        (JSC::MarkedSpace::size):
        (JSC::MarkedSpace::reset):
        (JSC::MarkedSpace::primaryHeapBegin):
        (JSC::MarkedSpace::primaryHeapEnd):
        * runtime/MarkedSpace.h: Copied from runtime/Heap.h.
        (JSC::MarkedSpace::globalData):
        (JSC::MarkedSpace::didShrink):
        (JSC::MarkedSpace::cellBlock):
        (JSC::MarkedSpace::cellOffset):
        (JSC::MarkedSpace::isCellMarked):
        (JSC::MarkedSpace::checkMarkCell):
        (JSC::MarkedSpace::markCell): Moved all code pertaining to managing chunks of
        collector memory into this class.

        * runtime/MemoryStatistics.cpp:
        (JSC::heapStatistics):
        * runtime/MemoryStatistics.h: Updated for MarkedSpace delegation.
2011-01-13  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Oliver Hunt.

        Split out a MarkedSpace strategy object from Heap.
        https://bugs.webkit.org/show_bug.cgi?id=52421

        * Shared/mac/WebMemorySampler.mac.mm:
        (WebKit::WebMemorySampler::sampleWebKit): Updated for class move.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
20 files changed:
Source/JavaScriptCore/Android.mk
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/GNUmakefile.am
Source/JavaScriptCore/JavaScriptCore.gypi
Source/JavaScriptCore/JavaScriptCore.pro
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/runtime/Heap.cpp
Source/JavaScriptCore/runtime/Heap.h
Source/JavaScriptCore/runtime/JSCell.h
Source/JavaScriptCore/runtime/JSValue.h
Source/JavaScriptCore/runtime/MarkedSpace.cpp [new file with mode: 0644]
Source/JavaScriptCore/runtime/MarkedSpace.h [new file with mode: 0644]
Source/JavaScriptCore/runtime/MemoryStatistics.cpp
Source/JavaScriptCore/runtime/MemoryStatistics.h
WebKit/mac/ChangeLog
WebKit/mac/Misc/WebCoreStatistics.mm
WebKit2/ChangeLog
WebKit2/Shared/mac/WebMemorySampler.mac.mm