Changeset 35853 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Aug 20, 2008, 12:23:06 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Bring back shared JSGlobalData and implicit locking, because too many clients rely on it.

File:

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

trunk/JavaScriptCore/kjs/collector.cpp

@@ -25 +25 @@
 #include "ExecState.h"
 #include "JSGlobalObject.h"
+#include "JSLock.h"
 #include "JSString.h"
 #include "JSValue.h"
@@ -135 +136 @@
 Heap::~Heap()
 {
+    JSLock lock(false);
+
     // The global object is not GC protected at this point, so sweeping may delete it (and thus the global data)
     // before other objects that may use the global data.
@@ -274 +277 @@
 
     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
@@ -778 +783 @@
 {
     // Most clients do not need to call this, with the notable exception of WebCore.
-    // Clients that use context from a single context group from multiple threads are supposed
+    // Clients that use shared heap have JSLock protection, while others are supposed
     // to do explicit locking. WebCore violates this contract in Database code,
     // which calls gcUnprotect from a secondary thread.
@@ -788 +793 @@
 {
     ASSERT(k);
+    ASSERT(JSLock::currentThreadIsHoldingLock() || !m_globalData->isSharedInstance);
 
     if (JSImmediate::isImmediate(k))
@@ -804 +810 @@
 {
     ASSERT(k);
+    ASSERT(JSLock::currentThreadIsHoldingLock() || !m_globalData->isSharedInstance);
 
     if (JSImmediate::isImmediate(k))
@@ -941 +948 @@
 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))