Title: [128498] trunk/Source/_javascript_Core
- Revision
- 128498
- Author
- [email protected]
- Date
- 2012-09-13 13:08:53 -0700 (Thu, 13 Sep 2012)
Log Message
Rename forEachCell to forEachLiveCell
https://bugs.webkit.org/show_bug.cgi?id=96685
Reviewed by Oliver Hunt.
forEachCell actually only iterates over live cells. We should rename it to
reflect what it actually does. This is also helpful because we want to add a new
forEachCell that actually does iterate each and every cell in a MarkedBlock
regardless of whether or not it is live.
* debugger/Debugger.cpp:
(JSC::Debugger::recompileAllJSFunctions):
* heap/Heap.cpp:
(JSC::Heap::globalObjectCount):
(JSC::Heap::objectTypeCounts):
* heap/MarkedBlock.h:
(MarkedBlock):
(JSC::MarkedBlock::forEachLiveCell):
* heap/MarkedSpace.h:
(MarkedSpace):
(JSC::MarkedSpace::forEachLiveCell):
* runtime/JSGlobalData.cpp:
(JSC::JSGlobalData::releaseExecutableMemory):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (128497 => 128498)
--- trunk/Source/_javascript_Core/ChangeLog 2012-09-13 20:02:39 UTC (rev 128497)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-09-13 20:08:53 UTC (rev 128498)
@@ -1,3 +1,29 @@
+2012-09-13 Mark Hahnenberg <[email protected]>
+
+ Rename forEachCell to forEachLiveCell
+ https://bugs.webkit.org/show_bug.cgi?id=96685
+
+ Reviewed by Oliver Hunt.
+
+ forEachCell actually only iterates over live cells. We should rename it to
+ reflect what it actually does. This is also helpful because we want to add a new
+ forEachCell that actually does iterate each and every cell in a MarkedBlock
+ regardless of whether or not it is live.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::recompileAllJSFunctions):
+ * heap/Heap.cpp:
+ (JSC::Heap::globalObjectCount):
+ (JSC::Heap::objectTypeCounts):
+ * heap/MarkedBlock.h:
+ (MarkedBlock):
+ (JSC::MarkedBlock::forEachLiveCell):
+ * heap/MarkedSpace.h:
+ (MarkedSpace):
+ (JSC::MarkedSpace::forEachLiveCell):
+ * runtime/JSGlobalData.cpp:
+ (JSC::JSGlobalData::releaseExecutableMemory):
+
2012-09-13 Filip Pizlo <[email protected]>
[Qt][Win] REGRESSION(r128400): It broke the build
Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (128497 => 128498)
--- trunk/Source/_javascript_Core/debugger/Debugger.cpp 2012-09-13 20:02:39 UTC (rev 128497)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp 2012-09-13 20:08:53 UTC (rev 128498)
@@ -118,7 +118,7 @@
return;
Recompiler recompiler(this);
- globalData->heap.objectSpace().forEachCell(recompiler);
+ globalData->heap.objectSpace().forEachLiveCell(recompiler);
}
JSValue evaluateInGlobalCallFrame(const String& script, JSValue& exception, JSGlobalObject* globalObject)
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (128497 => 128498)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2012-09-13 20:02:39 UTC (rev 128497)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2012-09-13 20:08:53 UTC (rev 128498)
@@ -618,7 +618,7 @@
size_t Heap::globalObjectCount()
{
- return m_objectSpace.forEachCell<CountIfGlobalObject>();
+ return m_objectSpace.forEachLiveCell<CountIfGlobalObject>();
}
size_t Heap::protectedObjectCount()
@@ -633,7 +633,7 @@
PassOwnPtr<TypeCountSet> Heap::objectTypeCounts()
{
- return m_objectSpace.forEachCell<RecordType>();
+ return m_objectSpace.forEachLiveCell<RecordType>();
}
void Heap::deleteAllCompiledCode()
Modified: trunk/Source/_javascript_Core/heap/MarkedBlock.h (128497 => 128498)
--- trunk/Source/_javascript_Core/heap/MarkedBlock.h 2012-09-13 20:02:39 UTC (rev 128497)
+++ trunk/Source/_javascript_Core/heap/MarkedBlock.h 2012-09-13 20:08:53 UTC (rev 128498)
@@ -185,7 +185,7 @@
template <int size> inline void gatherDirtyCellsWithSize(DirtyCellVector&);
#endif
- template <typename Functor> void forEachCell(Functor&);
+ template <typename Functor> void forEachLiveCell(Functor&);
template <typename Functor> void forEachDeadCell(Functor&);
private:
@@ -407,7 +407,7 @@
return isLive(static_cast<const JSCell*>(p));
}
- template <typename Functor> inline void MarkedBlock::forEachCell(Functor& functor)
+ template <typename Functor> inline void MarkedBlock::forEachLiveCell(Functor& functor)
{
for (size_t i = firstAtom(); i < m_endAtom; i += m_atomsPerCell) {
JSCell* cell = reinterpret_cast_ptr<JSCell*>(&atoms()[i]);
Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.h (128497 => 128498)
--- trunk/Source/_javascript_Core/heap/MarkedSpace.h 2012-09-13 20:02:39 UTC (rev 128497)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.h 2012-09-13 20:08:53 UTC (rev 128498)
@@ -93,8 +93,8 @@
typedef HashSet<MarkedBlock*>::iterator BlockIterator;
- template<typename Functor> typename Functor::ReturnType forEachCell(Functor&);
- template<typename Functor> typename Functor::ReturnType forEachCell();
+ template<typename Functor> typename Functor::ReturnType forEachLiveCell(Functor&);
+ template<typename Functor> typename Functor::ReturnType forEachLiveCell();
template<typename Functor> typename Functor::ReturnType forEachBlock(Functor&);
template<typename Functor> typename Functor::ReturnType forEachBlock();
@@ -140,20 +140,20 @@
MarkedBlockSet m_blocks;
};
-template<typename Functor> inline typename Functor::ReturnType MarkedSpace::forEachCell(Functor& functor)
+template<typename Functor> inline typename Functor::ReturnType MarkedSpace::forEachLiveCell(Functor& functor)
{
canonicalizeCellLivenessData();
BlockIterator end = m_blocks.set().end();
for (BlockIterator it = m_blocks.set().begin(); it != end; ++it)
- (*it)->forEachCell(functor);
+ (*it)->forEachLiveCell(functor);
return functor.returnValue();
}
-template<typename Functor> inline typename Functor::ReturnType MarkedSpace::forEachCell()
+template<typename Functor> inline typename Functor::ReturnType MarkedSpace::forEachLiveCell()
{
Functor functor;
- return forEachCell(functor);
+ return forEachLiveCell(functor);
}
inline MarkedAllocator& MarkedSpace::firstAllocator()
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp (128497 => 128498)
--- trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp 2012-09-13 20:02:39 UTC (rev 128497)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp 2012-09-13 20:08:53 UTC (rev 128498)
@@ -459,7 +459,7 @@
recompiler.currentlyExecutingFunctions.add(static_cast<FunctionExecutable*>(executable));
}
- heap.objectSpace().forEachCell<StackPreservingRecompiler>(recompiler);
+ heap.objectSpace().forEachLiveCell<StackPreservingRecompiler>(recompiler);
}
m_regExpCache->invalidateCode();
heap.collectAllGarbage();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
