Changeset 34659 in webkit for trunk/JavaScriptCore/kjs/JSGlobalData.cpp

Timestamp:

Jun 19, 2008, 10:29:29 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Prepare JavaScript heap for being per-thread.

File:

• trunk/JavaScriptCore/kjs/JSGlobalData.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/JSGlobalData.cpp

@@ -39 +39 @@
 
 #if USE(MULTIPLE_THREADS)
+#include <wtf/Threading.h>
 #include <wtf/ThreadSpecific.h>
 #endif
@@ -56 +57 @@
 
 JSGlobalData::JSGlobalData()
-//    : heap(new Heap)
+    : heap(new Heap)
 #if USE(MULTIPLE_THREADS)
-    : arrayTable(new HashTable(KJS::arrayTable))
+    , arrayTable(new HashTable(KJS::arrayTable))
     , dateTable(new HashTable(KJS::dateTable))
     , mathTable(new HashTable(KJS::mathTable))
@@ -66 +67 @@
     , stringTable(new HashTable(KJS::stringTable))
 #else
-    : arrayTable(&KJS::arrayTable)
+    , arrayTable(&KJS::arrayTable)
     , dateTable(&KJS::dateTable)
     , mathTable(&KJS::mathTable)
@@ -119 +120 @@
 }
 
+JSGlobalData& JSGlobalData::sharedInstance()
+{
+    return threadInstance();
+/*
+#if USE(MULTIPLE_THREADS)
+    AtomicallyInitializedStatic(JSGlobalData, sharedInstance);
+#else
+    static JSGlobalData sharedInstance;
+#endif
+    return sharedInstance;
+*/
 }
+
+}