Changeset 35853 in webkit for trunk/JavaScriptCore/kjs

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.

Location:

trunk/JavaScriptCore/kjs

Files:

• AllInOneFile.cpp (modified) (1 diff)
• JSGlobalData.cpp (modified) (5 diffs)
• JSGlobalData.h (modified) (2 diffs)
• JSGlobalObject.cpp (modified) (3 diffs)
• JSLock.cpp (added)
• JSLock.h (added)
• Shell.cpp (modified) (3 diffs)
• collector.cpp (modified) (7 diffs)
• interpreter.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/AllInOneFile.cpp

@@ -62 +62 @@
 #include "interpreter.cpp"
 #include "JSImmediate.cpp"
+#include "JSLock.cpp"
 #include "JSWrapperObject.cpp"
 #include "lexer.cpp"

trunk/JavaScriptCore/kjs/JSGlobalData.cpp

@@ -33 +33 @@
 #include "CommonIdentifiers.h"
 #include "JSClassRef.h"
+#include "JSLock.h"
 #include "Machine.h"
 #include "Parser.h"
@@ -56 +57 @@
 extern const HashTable stringTable;
 
-JSGlobalData::JSGlobalData()
+JSGlobalData::JSGlobalData(bool isShared)
     : machine(new Machine)
     , heap(new Heap(this))
@@ -85 +86 @@
     , parser(new Parser)
     , head(0)
+    , isSharedInstance(isShared)
 {
 }
@@ -91 +93 @@
 {
     delete heap;
-    heap = 0; // zeroing out to make the behavior more predictable when someone attempts to use a deleted instance.
     delete machine;
+#ifndef NDEBUG
+    // Zeroing out to make the behavior more predictable when someone attempts to use a deleted instance.
+    heap = 0;
     machine = 0;
+#endif
 
 #if ENABLE(JSC_MULTIPLE_THREADS)
@@ -132 +137 @@
 }
 
+bool JSGlobalData::sharedInstanceExists()
+{
+    return sharedInstanceInternal();
 }
+
+JSGlobalData& JSGlobalData::sharedInstance()
+{
+    JSGlobalData*& instance = sharedInstanceInternal();
+    if (!instance)
+        instance = new JSGlobalData(true);
+    return *instance;
+}
+
+JSGlobalData*& JSGlobalData::sharedInstanceInternal()
+{
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+    static JSGlobalData* sharedInstance;
+    return sharedInstance;
+}
+
+}

trunk/JavaScriptCore/kjs/JSGlobalData.h

@@ -55 +55 @@
     class JSGlobalData : public RefCounted<JSGlobalData> {
     public:
+        static bool sharedInstanceExists();
+        static JSGlobalData& sharedInstance();
+
         static PassRefPtr<JSGlobalData> create();
         ~JSGlobalData();
@@ -83 +86 @@
         JSGlobalObject* head;
 
+        bool isSharedInstance;
+
     private:
-        JSGlobalData();
+        JSGlobalData(bool isShared = false);
+
+        static JSGlobalData*& sharedInstanceInternal();
     };
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -44 +44 @@
 #include "GlobalEvalFunction.h"
 #include "JSGlobalObjectFunctions.h"
+#include "JSLock.h"
 #include "Machine.h"
 #include "MathObject.h"
@@ -79 +80 @@
 JSGlobalObject::~JSGlobalObject()
 {
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+
     if (d()->debugger)
         d()->debugger->detach(this);
@@ -110 +113 @@
 void JSGlobalObject::init(JSObject* thisValue)
 {
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+
     d()->globalData = Heap::heap(this)->globalData();
 

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -31 +31 @@
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
+#include "JSLock.h"
 #include "JSObject.h"
 #include "Parser.h"
@@ -209 +210 @@
 JSValue* functionGC(ExecState* exec, JSObject*, JSValue*, const ArgList&)
 {
+    JSLock lock(false);
     exec->heap()->collect();
     return jsUndefined();
@@ -460 +462 @@
     KJS::initializeThreading();
 
+    JSLock lock(false);
+
     Options options;
     parseArguments(argc, argv, options);

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))

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -26 +26 @@
 #include "ExecState.h"
 #include "JSGlobalObject.h"
+#include "JSLock.h"
 #include "Machine.h"
 #include "Parser.h"
@@ -46 +47 @@
 Completion Interpreter::checkSyntax(ExecState* exec, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source)
 {
+    JSLock lock(exec);
+
     int errLine;
     UString errMsg;
@@ -62 +65 @@
 Completion Interpreter::evaluate(ExecState* exec, ScopeChain& scopeChain, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source, JSValue* thisValue)
 {
+    JSLock lock(exec);
+    
     // parse the source code
     int sourceId;