Changeset 37215 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 2, 2008, 4:48:47 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-10-02 Darin Adler <Darin Adler>

Reviewed by Geoff Garen.

• ​https://bugs.webkit.org/show_bug.cgi?id=21321 Bug 21321: speed up JavaScriptCore by inlining Heap in JSGlobalData

1.019x as fast on SunSpider.

• API/JSBase.cpp: (JSEvaluateScript): Use heap. instead of heap-> to work with the heap. (JSCheckScriptSyntax): Ditto. (JSGarbageCollect): Ditto. (JSReportExtraMemoryCost): Ditto.
• API/JSContextRef.cpp: (JSGlobalContextRetain): Ditto. (JSGlobalContextRelease): Destroy the heap with the destroy function instead of the delete operator. (JSContextGetGlobalObject): Use heap. instead of heap-> to work with the heap.
• API/JSObjectRef.cpp: (JSObjectMake): Use heap. instead of heap-> to work with the heap. (JSObjectMakeFunctionWithCallback): Ditto. (JSObjectMakeConstructor): Ditto. (JSObjectMakeFunction): Ditto. (JSObjectMakeArray): Ditto. (JSObjectMakeDate): Ditto. (JSObjectMakeError): Ditto. (JSObjectMakeRegExp): Ditto. (JSObjectHasProperty): Ditto. (JSObjectGetProperty): Ditto. (JSObjectSetProperty): Ditto. (JSObjectGetPropertyAtIndex): Ditto. (JSObjectSetPropertyAtIndex): Ditto. (JSObjectDeleteProperty): Ditto. (JSObjectCallAsFunction): Ditto. (JSObjectCallAsConstructor): Ditto. (JSObjectCopyPropertyNames): Ditto. (JSPropertyNameAccumulatorAddName): Ditto.
• API/JSValueRef.cpp: (JSValueIsEqual): Ditto. (JSValueIsInstanceOfConstructor): Ditto. (JSValueMakeNumber): Ditto. (JSValueMakeString): Ditto. (JSValueToNumber): Ditto. (JSValueToStringCopy): Ditto. (JSValueToObject): Ditto. (JSValueProtect): Ditto. (JSValueUnprotect): Ditto.

• kjs/ExecState.h: (JSC::ExecState::heap): Update to use the & operator.

• kjs/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData): Update to initialize a heap member instead of calling new to make a heap. (JSC::JSGlobalData::~JSGlobalData): Destroy the heap with the destroy function instead of the delete operator.
• kjs/JSGlobalData.h: Change from Heap* to a Heap.
• kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::mark): Use the & operator here. (JSC::JSGlobalObject::operator new): Use heap. instead of heap-> to work with the heap.

WebCore:

2008-10-02 Darin Adler <Darin Adler>

Reviewed by Geoff Garen.

• ​https://bugs.webkit.org/show_bug.cgi?id=21321 Bug 21321: speed up JavaScriptCore by inlining Heap in JSGlobalData

• bindings/js/GCController.cpp: (WebCore::collect): Use heap. instead of heap-> to work with the heap. (WebCore::GCController::gcTimerFired): Ditto. (WebCore::GCController::garbageCollectNow): Ditto.
• bindings/js/JSDOMWindowShell.cpp: (WebCore::JSDOMWindowShell::operator new): Ditto.
• storage/Database.cpp: (WebCore::Database::Database): Ditto.

WebKit/mac:

2008-10-02 Darin Adler <Darin Adler>

Reviewed by Geoff Garen.

• ​https://bugs.webkit.org/show_bug.cgi?id=21321 Bug 21321: speed up JavaScriptCore by inlining Heap in JSGlobalData

• Misc/WebCoreStatistics.mm: (+[WebCoreStatistics javaScriptObjectsCount]): Use heap. instead of heap-> to work with the heap. (+[WebCoreStatistics javaScriptGlobalObjectsCount]): Ditto. (+[WebCoreStatistics javaScriptProtectedObjectsCount]): Ditto. (+[WebCoreStatistics javaScriptProtectedGlobalObjectsCount]): Ditto. (+[WebCoreStatistics javaScriptProtectedObjectTypeCounts]): Ditto. (+[WebCoreStatistics javaScriptReferencedObjectsCount]): Ditto.

WebKit/win:

2008-10-02 Darin Adler <Darin Adler>

• ​https://bugs.webkit.org/show_bug.cgi?id=21321 Bug 21321: speed up JavaScriptCore by inlining Heap in JSGlobalData

• WebCoreStatistics.cpp: (WebCoreStatistics::javaScriptObjectsCount): Use heap. instead of heap-> to work with the heap. (WebCoreStatistics::javaScriptGlobalObjectsCount): Ditto. (WebCoreStatistics::javaScriptProtectedObjectsCount): Ditto. (WebCoreStatistics::javaScriptProtectedGlobalObjectsCount): Ditto. (WebCoreStatistics::javaScriptProtectedObjectTypeCounts): Ditto.
• WebJavaScriptCollector.cpp: (WebJavaScriptCollector::objectCount): Ditto.

Location:

trunk/JavaScriptCore/kjs

Files:

• ExecState.h (modified) (1 diff)
• JSGlobalData.cpp (modified) (3 diffs)
• JSGlobalData.h (modified) (3 diffs)
• JSGlobalObject.cpp (modified) (2 diffs)
• collector.cpp (modified) (3 diffs)
• collector.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ExecState.h

@@ -83 +83 @@
         static const HashTable* stringTable(ExecState* exec) { return exec->m_globalData->stringTable; }
 
-        Heap* heap() const { return m_globalData->heap; }
+        Heap* heap() const { return &m_globalData->heap; }
 
     private:

trunk/JavaScriptCore/kjs/JSGlobalData.cpp

@@ -59 +59 @@
 JSGlobalData::JSGlobalData(bool isShared)
     : machine(new Machine)
-    , heap(new Heap(this))
 #if ENABLE(JSC_MULTIPLE_THREADS)
     , arrayTable(new HashTable(JSC::arrayTable))
@@ -90 +89 @@
     , isSharedInstance(isShared)
     , clientData(0)
+    , heap(this)
 {
 }
@@ -95 +95 @@
 JSGlobalData::~JSGlobalData()
 {
-    delete heap;
+    heap.destroy();
     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

trunk/JavaScriptCore/kjs/JSGlobalData.h

@@ -31 +31 @@
 
 #include <wtf/Forward.h>
-#include <wtf/HashCountedSet.h>
 #include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
+#include "collector.h"
 #include "SmallStrings.h"
 
@@ -65 +64 @@
 
         Machine* machine;
-        Heap* heap;
 
         const HashTable* arrayTable;
@@ -105 +103 @@
         HashSet<JSObject*> arrayVisitedElements;
 
+        Heap heap;
+
     private:
         JSGlobalData(bool isShared = false);

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -360 +360 @@
     RegisterFile& registerFile = globalData()->machine->registerFile();
     if (registerFile.globalObject() == this)
-        registerFile.markGlobals(globalData()->heap);
+        registerFile.markGlobals(&globalData()->heap);
 
     markIfNeeded(d()->globalExec->exception());
@@ -449 +449 @@
 {
 #ifdef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE
-    return globalData->heap->inlineAllocate(size);
+    return globalData->heap.inlineAllocate(size);
 #else
-    return globalData->heap->allocate(size);
+    return globalData->heap.allocate(size);
 #endif
 }

trunk/JavaScriptCore/kjs/collector.cpp

@@ -124 +124 @@
     , m_globalData(globalData)
 {
+    ASSERT(globalData);
+
 #if ENABLE(JSC_MULTIPLE_THREADS)
     int error = pthread_key_create(&m_currentThreadRegistrar, unregisterThread);
@@ -136 +138 @@
 Heap::~Heap()
 {
+    // The destroy function must already have been called, so assert this.
+    ASSERT(!m_globalData);
+}
+
+void Heap::destroy()
+{
     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.
+    if (!m_globalData)
+        return;
+
+    // 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.
     RefPtr<JSGlobalData> protect(m_globalData);
 
@@ -167 +178 @@
     }
 #endif
+
+    m_globalData = 0;
 }
 

trunk/JavaScriptCore/kjs/collector.h

@@ -64 +64 @@
         class Thread;
         enum HeapType { PrimaryHeap, NumberHeap };
+
+        void destroy();
 
 #ifdef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE
@@ -79 +81 @@
         bool isBusy(); // true if an allocation or collection is in progress
 
-        ~Heap();
-
         static const size_t minExtraCostSize = 256;
 
@@ -119 +119 @@
         friend class JSGlobalData;
         Heap(JSGlobalData*);
+        ~Heap();
 
         void recordExtraCost(size_t);