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

Timestamp:

Jul 3, 2008, 12:44:43 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

Don't create unnecessary JSGlobalData instances.

• kjs/JSGlobalData.h:
• kjs/JSGlobalData.cpp: (KJS::JSGlobalData::threadInstanceExists): (KJS::JSGlobalData::sharedInstanceExists): (KJS::JSGlobalData::threadInstance): (KJS::JSGlobalData::sharedInstance): (KJS::JSGlobalData::threadInstanceInternal): (KJS::JSGlobalData::sharedInstanceInternal): Added methods to query instance existence.

• kjs/InitializeThreading.cpp: (KJS::initializeThreadingOnce): Initialize thread instance static in a new way.

• API/JSBase.cpp: (JSGarbageCollect):
• kjs/collector.cpp: (KJS::Heap::collect): Check for instance existence before accessing it.

File:

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

trunk/JavaScriptCore/kjs/JSGlobalData.cpp

@@ -32 +32 @@
 #include "collector.h"
 #include "CommonIdentifiers.h"
+#include "JSLock.h"
 #include "lexer.h"
 #include "list.h"
@@ -120 +121 @@
 }
 
+bool JSGlobalData::threadInstanceExists()
+{
+    return threadInstanceInternal();
+}
+
+bool JSGlobalData::sharedInstanceExists()
+{
+    return sharedInstanceInternal();
+}
+
 JSGlobalData& JSGlobalData::threadInstance()
 {
-#if USE(MULTIPLE_THREADS)
-    static ThreadSpecific<JSGlobalData> sharedInstance;
-    return *sharedInstance;
-#else
-    static JSGlobalData sharedInstance;
-    return sharedInstance;
-#endif
+    JSGlobalData*& instance = threadInstanceInternal();
+    if (!instance)
+        instance = new JSGlobalData;
+    return *instance;
 }
 
 JSGlobalData& JSGlobalData::sharedInstance()
 {
+    JSGlobalData*& instance = sharedInstanceInternal();
+    if (!instance)
+        instance = new JSGlobalData(true);
+    return *instance;
+}
+
+JSGlobalData*& JSGlobalData::threadInstanceInternal()
+{
 #if USE(MULTIPLE_THREADS)
-    MutexLocker locker(*atomicallyInitializedStaticMutex);
+    static ThreadSpecific<DataInstance> threadInstance;
+    return *threadInstance;
+#else
+    static JSGlobalData threadInstance;
+    return &threadInstance;
 #endif
+}
+
+JSGlobalData*& JSGlobalData::sharedInstanceInternal()
+{
+    ASSERT(JSLock::currentThreadIsHoldingLock());
     static JSGlobalData* sharedInstance;
-    if (!sharedInstance)
-        sharedInstance = new JSGlobalData(true);
-    return *sharedInstance;
+    return sharedInstance;
 }