Changeset 35853 in webkit for trunk/JavaScriptCore/kjs/JSGlobalData.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/JSGlobalData.cpp (modified) (5 diffs)

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;
+}
+
+}