Changeset 91814 in webkit

Timestamp:

Jul 26, 2011 7:41:13 PM (13 years ago)

Author:

dslomov@google.com

Message:

[V8][Chromium] Run workers in a separate v8::Isolate
​https://bugs.webkit.org/show_bug.cgi?id=65004
This patch allocates a new v8::Isolate for every worker and enters it on worker thread.

Reviewed by David Levin.

Covered by existing chromium tests.

• bindings/v8/DOMDataStore.cpp:

(WebCore::DOMDataStore::DOMDataStore):
(WebCore::DOMDataStore::~DOMDataStore):

• bindings/v8/StaticDOMDataStore.cpp:

(WebCore::StaticDOMDataStore::StaticDOMDataStore):
(WebCore::StaticDOMDataStore::~StaticDOMDataStore):

• bindings/v8/StaticDOMDataStore.h:
• bindings/v8/V8Binding.h:

(WebCore::V8BindingPerIsolateData::registerDOMDataStore):
(WebCore::V8BindingPerIsolateData::unregisterDOMDataStore):

• bindings/v8/V8DOMMap.cpp:

(WebCore::DOMDataStoreHandle::DOMDataStoreHandle):
(WebCore::DOMDataStoreHandle::~DOMDataStoreHandle):

• bindings/v8/WorkerContextExecutionProxy.cpp:

(WebCore::WorkerContextExecutionProxy::WorkerContextExecutionProxy):
(WebCore::WorkerContextExecutionProxy::initV8):

• bindings/v8/WorkerContextExecutionProxy.h:
• bindings/v8/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::WorkerScriptController):
(WebCore::WorkerScriptController::~WorkerScriptController):

• bindings/v8/WorkerScriptController.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/DOMDataStore.cpp (modified) (1 diff)
• bindings/v8/StaticDOMDataStore.cpp (modified) (2 diffs)
• bindings/v8/StaticDOMDataStore.h (modified) (1 diff)
• bindings/v8/V8Binding.cpp (modified) (1 diff)
• bindings/v8/V8Binding.h (modified) (2 diffs)
• bindings/v8/V8DOMMap.cpp (modified) (2 diffs)
• bindings/v8/WorkerContextExecutionProxy.cpp (modified) (3 diffs)
• bindings/v8/WorkerContextExecutionProxy.h (modified) (1 diff)
• bindings/v8/WorkerScriptController.cpp (modified) (2 diffs)
• bindings/v8/WorkerScriptController.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-26  Dmitry Lomov  <dslomov@google.com>
+
+        [V8][Chromium] Run workers in a separate v8::Isolate 
+        https://bugs.webkit.org/show_bug.cgi?id=65004
+        This patch allocates a new v8::Isolate for every worker and enters it on worker thread.
+
+        Reviewed by David Levin.
+
+        Covered by existing chromium tests.
+
+        * bindings/v8/DOMDataStore.cpp:
+        (WebCore::DOMDataStore::DOMDataStore):
+        (WebCore::DOMDataStore::~DOMDataStore):
+        * bindings/v8/StaticDOMDataStore.cpp:
+        (WebCore::StaticDOMDataStore::StaticDOMDataStore):
+        (WebCore::StaticDOMDataStore::~StaticDOMDataStore):
+        * bindings/v8/StaticDOMDataStore.h:
+        * bindings/v8/V8Binding.h:
+        (WebCore::V8BindingPerIsolateData::registerDOMDataStore):
+        (WebCore::V8BindingPerIsolateData::unregisterDOMDataStore):
+        * bindings/v8/V8DOMMap.cpp:
+        (WebCore::DOMDataStoreHandle::DOMDataStoreHandle):
+        (WebCore::DOMDataStoreHandle::~DOMDataStoreHandle):
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::WorkerContextExecutionProxy):
+        (WebCore::WorkerContextExecutionProxy::initV8):
+        * bindings/v8/WorkerContextExecutionProxy.h:
+        * bindings/v8/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::WorkerScriptController):
+        (WebCore::WorkerScriptController::~WorkerScriptController):
+        * bindings/v8/WorkerScriptController.h:
+
 2011-07-26  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/bindings/v8/DOMDataStore.cpp

@@ -92 +92 @@
 #endif
 {
-    DOMDataStore::allStores().append(this);
 }
 
 DOMDataStore::~DOMDataStore()
 {
-    DOMDataStore::allStores().remove(DOMDataStore::allStores().find(this));
 }
 

trunk/Source/WebCore/bindings/v8/StaticDOMDataStore.cpp

@@ -31 +31 @@
 #include "config.h"
 #include "StaticDOMDataStore.h"
+#include "V8Binding.h"
 
 namespace WebCore {
@@ -49 +50 @@
     m_domSvgElementInstanceMap = &m_staticDomSvgElementInstanceMap;
 #endif
+    V8BindingPerIsolateData::current()->registerDOMDataStore(this);
+}
+
+StaticDOMDataStore::~StaticDOMDataStore()
+{
+    V8BindingPerIsolateData::current()->unregisterDOMDataStore(this);
 }
 

trunk/Source/WebCore/bindings/v8/StaticDOMDataStore.h

@@ -48 +48 @@
 public:
     StaticDOMDataStore();
+    virtual ~StaticDOMDataStore();
 
 private:

trunk/Source/WebCore/bindings/v8/V8Binding.cpp

@@ -50 +50 @@
 
 V8BindingPerIsolateData::V8BindingPerIsolateData(v8::Isolate* isolate)
-    : m_DOMDataStore(0)
+    : m_domDataStore(0)
 {
 }

trunk/Source/WebCore/bindings/v8/V8Binding.h

@@ -110 +110 @@
         StringCache* stringCache() { return &m_stringCache; }
 
-        DOMDataList& allStores() { return m_DOMDataList; }
-
-        DOMDataStore* domDataStore() { return m_DOMDataStore; }
+        DOMDataList& allStores() { return m_domDataList; }
+
+        void registerDOMDataStore(DOMDataStore* domDataStore) 
+        {
+            m_domDataList.append(domDataStore);
+        }
+
+        void unregisterDOMDataStore(DOMDataStore* domDataStore)
+        {
+            ASSERT(m_domDataList.find(domDataStore));
+            m_domDataList.remove(m_domDataList.find(domDataStore));
+        }
+
+
+        DOMDataStore* domDataStore() { return m_domDataStore; }
         // DOMDataStore is owned outside V8BindingPerIsolateData.
-        void setDOMDataStore(DOMDataStore* store) { m_DOMDataStore = store; }
+        void setDOMDataStore(DOMDataStore* store) { m_domDataStore = store; }
 
     private:
@@ -126 +138 @@
         StringCache m_stringCache;
 
-        DOMDataList m_DOMDataList;
-        DOMDataStore* m_DOMDataStore;
+        DOMDataList m_domDataList;
+        DOMDataStore* m_domDataStore;
     };
 

trunk/Source/WebCore/bindings/v8/V8DOMMap.cpp

@@ -35 +35 @@
 #include "DOMDataStore.h"
 #include "ScopedDOMDataStore.h"
+#include "V8Binding.h"
 
 namespace WebCore {
@@ -41 +42 @@
     : m_store(adoptPtr(new ScopedDOMDataStore()))
 {
+    V8BindingPerIsolateData::current()->registerDOMDataStore(m_store.get());
 }
 
 DOMDataStoreHandle::~DOMDataStoreHandle()
 {
+    V8BindingPerIsolateData::current()->unregisterDOMDataStore(m_store.get());
 }
 

trunk/Source/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp

@@ -84 +84 @@
     , m_recursion(0)
 {
-    initV8IfNeeded();
+    initV8();
 }
 
@@ -109 +109 @@
 }
 
-void WorkerContextExecutionProxy::initV8IfNeeded()
-{
-    static bool v8Initialized = false;
-
-    if (v8Initialized)
-        return;
-
+void WorkerContextExecutionProxy::initV8()
+{
     // Tell V8 not to call the default OOM handler, binding code will handle it.
     v8::V8::IgnoreOutOfMemoryException();
@@ -126 +121 @@
 
     V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
-
-    v8Initialized = true;
 }
 

trunk/Source/WebCore/bindings/v8/WorkerContextExecutionProxy.h

@@ -74 +74 @@
 
     private:
-        void initV8IfNeeded();
+        void initV8();
         bool initContextIfNeeded();
         void dispose();

trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp

@@ -52 +52 @@
 WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
     : m_workerContext(workerContext)
-    , m_proxy(adoptPtr(new WorkerContextExecutionProxy(workerContext)))
+    , m_isolate(v8::Isolate::New())
     , m_executionForbidden(false)
 {
+    V8BindingPerIsolateData* data = V8BindingPerIsolateData::create(m_isolate);
+    data->allStores().append(&m_DOMDataStore);
+    data->setDOMDataStore(&m_DOMDataStore);
+    m_isolate->Enter();
+    m_proxy = adoptPtr(new WorkerContextExecutionProxy(workerContext));
 }
 
@@ -60 +65 @@
 {
     removeAllDOMObjects();
+    m_proxy.clear();
+    m_isolate->Exit();
+    V8BindingPerIsolateData::dispose(m_isolate);
+    m_isolate->Dispose();
 }
 

trunk/Source/WebCore/bindings/v8/WorkerScriptController.h

@@ -34 +34 @@
 #if ENABLE(WORKERS)
 
+#include "ScopedDOMDataStore.h"
+#include "V8Binding.h"
+
+#include <v8.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/Threading.h>
@@ -75 +79 @@
         WorkerContext* m_workerContext;
         OwnPtr<WorkerContextExecutionProxy> m_proxy;
+        v8::Isolate* m_isolate;
+        ScopedDOMDataStore m_DOMDataStore;
         bool m_executionForbidden;
     };