From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/JavaScriptCore/heap/MarkStack.h | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'Source/JavaScriptCore/heap/MarkStack.h') diff --git a/Source/JavaScriptCore/heap/MarkStack.h b/Source/JavaScriptCore/heap/MarkStack.h index 48b65c069..0695b1b32 100644 --- a/Source/JavaScriptCore/heap/MarkStack.h +++ b/Source/JavaScriptCore/heap/MarkStack.h @@ -34,14 +34,12 @@ #include "UnconditionalFinalizer.h" #include "VTableSpectrum.h" #include "WeakReferenceHarvester.h" -#include #include #include #include #include #include #include -#include namespace JSC { @@ -173,17 +171,13 @@ namespace JSC { ~MarkStackThreadSharedData(); void reset(); - -#if ENABLE(PARALLEL_GC) - void resetChildren(); -#endif - + private: friend class MarkStack; friend class SlotVisitor; #if ENABLE(PARALLEL_GC) - void markingThreadMain(SlotVisitor*); + void markingThreadMain(); static void markingThreadStartFunc(void* heap); #endif @@ -193,7 +187,6 @@ namespace JSC { MarkStackSegmentAllocator m_segmentAllocator; Vector m_markingThreads; - Vector m_slaveMarkStacks; Mutex m_markingLock; ThreadCondition m_markingCondition; @@ -228,14 +221,13 @@ namespace JSC { void addOpaqueRoot(void*); bool containsOpaqueRoot(void*); int opaqueRootCount(); - - MarkStackThreadSharedData& sharedData() { return m_shared; } + bool isEmpty() { return m_stack.isEmpty(); } void reset(); size_t visitCount() const { return m_visitCount; } - + #if ENABLE(SIMPLE_HEAP_PROFILING) VTableSpectrum m_visitedTypeCounts; #endif @@ -259,7 +251,6 @@ namespace JSC { void internalAppend(JSCell*); void internalAppend(JSValue); - void internalAppend(JSValue*); JS_EXPORT_PRIVATE void mergeOpaqueRoots(); @@ -279,8 +270,6 @@ namespace JSC { MarkStackArray m_stack; HashSet m_opaqueRoots; // Handle-owning data structures not visible to the garbage collector. - typedef HashMap UniqueStringMap; - UniqueStringMap m_uniqueStrings; #if !ASSERT_DISABLED public: -- cgit v1.2.1