Changeset 427 for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (15 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -25 +25 @@
-#include "ExecState.h"
-#include "JSGlobalObject.h"
-#include "JSLock.h"
-#include "JSString.h"
-#include "JSValue.h"
@@ -185 +184 @@
-static void freeHeap(CollectorHeap*);
-
-USE(
+ENABLE(JSC_
-
-#if PLATFORM(DARWIN)
@@ -220 +219 @@
-Heap::Heap(JSGlobalData* globalData)
-    : m_markListSet(0)
-USE(
+ENABLE(JSC_
-    , m_registeredThreads(0)
-#endif
-    , m_globalData(globalData)
-{
-USE(
+ENABLE(JSC_
-    int error = pthread_key_create(&m_currentThreadRegistrar, unregisterThread);
-    if (error)
@@ -237 +236 @@
-Heap::~Heap()
-{
-    JSLock lock(false);
-
-    delete m_markListSet;
-    sweep<PrimaryHeap>();
@@ -248 +245 @@
-    freeHeap(&numberHeap);
-
-USE(
+ENABLE(JSC_
-#ifndef NDEBUG
-    int error =
@@ -283 +280 @@
-#else
-
-USE(
+ENABLE(JSC_
-#error Need to initialize pagesize safely.
-#endif
@@ -375 +372 @@
-
-    CollectorHeap& heap = heapType == PrimaryHeap ? primaryHeap : numberHeap;
-    ASSERT(JSLock::lockCount() > 0);
-    ASSERT(JSLock::currentThreadIsHoldingLock());
-    ASSERT(s <= HeapConstants<heapType>::cellSize);
-    UNUSED_PARAM(s); // s is now only used for the above assert
@@ -563 +558 @@
-}
-
-USE(
+ENABLE(JSC_
-
-static inline PlatformThread getCurrentPlatformThread()
@@ -624 +619 @@
-}
-
-USE(
+ENABLE(JSC_
-
-void Heap::registerThread()
@@ -715 +710 @@
-}
-
-USE(
+ENABLE(JSC_
-
-static inline void suspendThread(const PlatformThread& platformThread)
@@ -882 +877 @@
-    markCurrentThreadConservatively();
-
-USE(
+ENABLE(JSC_
-
-    if (m_currentThreadRegistrar) {
@@ -910 +905 @@
-{
-    // Most clients do not need to call this, with the notable exception of WebCore.
-shared heap have JSLock protection, while other
+context from a single context group from multiple thread
-    // to do explicit locking. WebCore violates this contract in Database code,
-    // which calls gcUnprotect from a secondary thread.
@@ -920 +915 @@
-{
-    ASSERT(k);
-    ASSERT(JSLock::currentThreadIsHoldingLock() || !m_globalData->isSharedInstance);
-
-    if (JSImmediate::isImmediate(k))
@@ -937 +931 @@
-{
-    ASSERT(k);
-    ASSERT(JSLock::currentThreadIsHoldingLock() || !m_globalData->isSharedInstance);
-
-    if (JSImmediate::isImmediate(k))
@@ -1075 +1068 @@
-bool Heap::collect()
-{
-#ifndef NDEBUG
-    if (m_globalData->isSharedInstance) {
-        ASSERT(JSLock::lockCount() > 0);
-        ASSERT(JSLock::currentThreadIsHoldingLock());
-    }
-#endif
-
-    ASSERT((primaryHeap.operationInProgress == NoOperation) | (numberHeap.operationInProgress == NoOperation));
-    if ((primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation))