Changeset 214970 in webkit for trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h

Timestamp:

Apr 5, 2017, 2:19:37 PM (8 years ago)

Author:

[email protected]

Message:

WebAssembly: Plans should be able to have more than one completion task.
​https://bugs.webkit.org/show_bug.cgi?id=170516

Reviewed by Saam Barati.

This patch also eliminates the need for blocked tasks on the
PromiseDeferredTimer and pendingPromise on Wasm::Plan.

• runtime/PromiseDeferredTimer.cpp:

(JSC::PromiseDeferredTimer::doWork):
(JSC::PromiseDeferredTimer::cancelPendingPromise):
(JSC::PromiseDeferredTimer::scheduleBlockedTask): Deleted.

• runtime/PromiseDeferredTimer.h:
• wasm/WasmPlan.cpp:

(JSC::Wasm::Plan::Plan):
(JSC::Wasm::Plan::addCompletionTask):
(JSC::Wasm::Plan::complete):

• wasm/WasmPlan.h:

(JSC::Wasm::Plan::setMode):
(JSC::Wasm::Plan::mode):
(JSC::Wasm::Plan::setModeAndPromise): Deleted.
(JSC::Wasm::Plan::pendingPromise): Deleted.

• wasm/WasmWorklist.cpp:

(JSC::Wasm::Worklist::enqueue):

• wasm/js/WebAssemblyInstanceConstructor.cpp:

(JSC::constructJSWebAssemblyInstance):

• wasm/js/WebAssemblyPrototype.cpp:

(JSC::instantiate):

File:

• trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h

@@ -56 +56 @@
     void scheduleWorkSoon(JSPromiseDeferred*, Task&&);
 
-    // Blocked tasks should only be registered while holding the JS API lock. If we didn't require holding the
-    // JS API lock then there might be a race where the promise you are waiting on is run before your task is
-    // registered.
-    void scheduleBlockedTask(JSPromiseDeferred*, Task&&);
-
     void stopRunningTasks() { m_runTasks = false; }
 
@@ -71 +66 @@
     bool m_shouldStopRunLoopWhenAllPromisesFinish { false };
     Vector<std::tuple<JSPromiseDeferred*, Task>> m_tasks;
-    HashMap<JSPromiseDeferred*, Vector<Task>> m_blockedTasks;
 };