<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214970] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214970">214970</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 14:19:37 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePromiseDeferredTimercpp">trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePromiseDeferredTimerh">trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmPlancpp">trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmPlanh">trunk/Source/JavaScriptCore/wasm/WasmPlan.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmWorklistcpp">trunk/Source/JavaScriptCore/wasm/WasmWorklist.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyInstanceConstructorcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyPrototypecpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-04-05 Keith Miller <keith_miller@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2017-04-05 Guilherme Iscaro <iscaro@profusion.mobi>
</span><span class="cx">
</span><span class="cx"> Do not use BLX for immediates (ARM-32)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePromiseDeferredTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -60,12 +60,6 @@
</span><span class="cx"> task();
</span><span class="cx"> m_vm->drainMicrotasks();
</span><span class="cx"> }
</span><del>-
- auto waitingTasks = m_blockedTasks.take(ticket);
- for (const Task& unblockedTask : waitingTasks) {
- unblockedTask();
- m_vm->drainMicrotasks();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_pendingPromises.isEmpty() && m_shouldStopRunLoopWhenAllPromisesFinish)
</span><span class="lines">@@ -120,9 +114,6 @@
</span><span class="cx"> if (result)
</span><span class="cx"> dataLogLnIf(verbose, "Canceling promise: ", RawPointer(ticket));
</span><span class="cx">
</span><del>- auto blockedTasks = m_blockedTasks.take(ticket);
- for (const Task& task : blockedTasks)
- task();
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,12 +125,4 @@
</span><span class="cx"> scheduleTimer(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PromiseDeferredTimer::scheduleBlockedTask(JSPromiseDeferred* blockingTicket, Task&& task)
-{
- ASSERT(m_vm->currentThreadIsHoldingAPILock());
- ASSERT(m_pendingPromises.contains(blockingTicket));
- auto result = m_blockedTasks.add(blockingTicket, Vector<Task>());
- result.iterator->value.append(WTFMove(task));
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePromiseDeferredTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -55,11 +55,6 @@
</span><span class="cx"> typedef std::function<void()> Task;
</span><span class="cx"> void scheduleWorkSoon(JSPromiseDeferred*, Task&&);
</span><span class="cx">
</span><del>- // 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&&);
-
</del><span class="cx"> void stopRunningTasks() { m_runTasks = false; }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void runRunLoop();
</span><span class="lines">@@ -70,7 +65,6 @@
</span><span class="cx"> bool m_runTasks { true };
</span><span class="cx"> bool m_shouldStopRunLoopWhenAllPromisesFinish { false };
</span><span class="cx"> Vector<std::tuple<JSPromiseDeferred*, Task>> m_tasks;
</span><del>- HashMap<JSPromiseDeferred*, Vector<Task>> m_blockedTasks;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx"> Plan::Plan(VM& vm, Ref<ModuleInformation> info, AsyncWork work, CompletionTask&& task)
</span><span class="cx"> : m_moduleInformation(WTFMove(info))
</span><span class="cx"> , m_vm(vm)
</span><del>- , m_completionTask(task)
</del><span class="cx"> , m_source(m_moduleInformation->source.data())
</span><span class="cx"> , m_sourceLength(m_moduleInformation->source.size())
</span><span class="cx"> , m_state(State::Validated)
</span><span class="cx"> , m_asyncWork(work)
</span><span class="cx"> {
</span><ins>+ m_completionTasks.append(WTFMove(task));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Plan::Plan(VM& vm, Vector<uint8_t>&& source, AsyncWork work, CompletionTask&& task)
</span><span class="lines">@@ -70,12 +70,12 @@
</span><span class="cx"> Plan::Plan(VM& vm, const uint8_t* source, size_t sourceLength, AsyncWork work, CompletionTask&& task)
</span><span class="cx"> : m_moduleInformation(makeRef(*new ModuleInformation(Vector<uint8_t>())))
</span><span class="cx"> , m_vm(vm)
</span><del>- , m_completionTask(task)
</del><span class="cx"> , m_source(source)
</span><span class="cx"> , m_sourceLength(sourceLength)
</span><span class="cx"> , m_state(State::Initial)
</span><span class="cx"> , m_asyncWork(work)
</span><span class="cx"> {
</span><ins>+ m_completionTasks.append(WTFMove(task));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* Plan::stateString(State state)
</span><span class="lines">@@ -104,6 +104,15 @@
</span><span class="cx"> complete(locker);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Plan::addCompletionTask(CompletionTask&& task)
+{
+ LockHolder locker(m_lock);
+ if (m_state != State::Completed)
+ m_completionTasks.append(WTFMove(task));
+ else
+ task(*this);
+}
+
</ins><span class="cx"> bool Plan::parseAndValidateModule()
</span><span class="cx"> {
</span><span class="cx"> if (m_state != State::Initial)
</span><span class="lines">@@ -317,7 +326,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_state != State::Completed) {
</span><span class="cx"> moveToState(State::Completed);
</span><del>- m_completionTask(*this);
</del><ins>+ for (auto& task : m_completionTasks)
+ task(*this);
</ins><span class="cx"> m_completed.notifyAll();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmPlanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmPlan.h (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmPlan.h 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/wasm/WasmPlan.h 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> JS_EXPORT_PRIVATE Plan(VM&, const uint8_t*, size_t, AsyncWork, CompletionTask&&);
</span><span class="cx"> JS_EXPORT_PRIVATE ~Plan();
</span><span class="cx">
</span><ins>+ void addCompletionTask(CompletionTask&&);
+
</ins><span class="cx"> bool parseAndValidateModule();
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void prepare();
</span><span class="lines">@@ -95,13 +97,8 @@
</span><span class="cx"> return WTFMove(m_wasmExitStubs);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setModeAndPromise(MemoryMode mode, JSPromiseDeferred* promise)
- {
- m_mode = mode;
- m_pendingPromise = promise;
- }
</del><ins>+ void setMode(MemoryMode mode) { m_mode = mode; }
</ins><span class="cx"> MemoryMode mode() const { return m_mode; }
</span><del>- JSPromiseDeferred* pendingPromise() { return m_pendingPromise; }
</del><span class="cx"> VM& vm() const { return m_vm; }
</span><span class="cx">
</span><span class="cx"> enum class State : uint8_t {
</span><span class="lines">@@ -139,8 +136,7 @@
</span><span class="cx"> Vector<CompilationContext> m_compilationContexts;
</span><span class="cx">
</span><span class="cx"> VM& m_vm;
</span><del>- JSPromiseDeferred* m_pendingPromise { nullptr };
- CompletionTask m_completionTask;
</del><ins>+ Vector<CompletionTask, 1> m_completionTasks;
</ins><span class="cx">
</span><span class="cx"> Vector<Vector<UnlinkedWasmToWasmCall>> m_unlinkedWasmToWasmCalls;
</span><span class="cx"> const uint8_t* m_source;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmWorklistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmWorklist.cpp (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmWorklist.cpp 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/wasm/WasmWorklist.cpp 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -187,10 +187,8 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If we don't have a promise it must be synchronous so we should boost the priority.
- Priority priority = plan->pendingPromise() ? Priority::Preparation : Priority::Synchronous;
- dataLogLnIf(verbose, "Enqueuing plan with priority: ", priorityString(priority));
- m_queue.push({ priority, nextTicket(), WTFMove(plan) });
</del><ins>+ dataLogLnIf(verbose, "Enqueuing plan");
+ m_queue.push({ Priority::Preparation, nextTicket(), WTFMove(plan) });
</ins><span class="cx"> m_planEnqueued->notifyOne(locker);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyInstanceConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> Wasm::ensureWorklist().completePlanSynchronously(instance->codeBlock()->plan());
</span><span class="cx"> else {
</span><span class="cx"> Ref<Wasm::Plan> plan = adoptRef(*new Plan(vm, makeRef(const_cast<Wasm::ModuleInformation&>(module->moduleInformation())), Plan::FullCompile, Plan::dontFinalize));
</span><del>- plan->setModeAndPromise(instance->memoryMode(), nullptr);
</del><ins>+ plan->setMode(instance->memoryMode());
</ins><span class="cx"> instance->addUnitializedCodeBlock(vm, plan.copyRef());
</span><span class="cx">
</span><span class="cx"> auto& worklist = Wasm::ensureWorklist();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp (214969 => 214970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp 2017-04-05 21:00:17 UTC (rev 214969)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp 2017-04-05 21:19:37 UTC (rev 214970)
</span><span class="lines">@@ -156,10 +156,12 @@
</span><span class="cx"> vm.promiseDeferredTimer->addPendingPromise(promise, WTFMove(dependencies));
</span><span class="cx">
</span><span class="cx"> if (instance->codeBlock()) {
</span><del>- vm.promiseDeferredTimer->scheduleBlockedTask(instance->codeBlock()->plan().pendingPromise(), [&vm, promise, instance, module, entries] () {
- auto* globalObject = instance->globalObject();
- ExecState* exec = globalObject->globalExec();
- resolve(vm, exec, promise, instance, module, entries);
</del><ins>+ instance->codeBlock()->plan().addCompletionTask([promise, instance, module, entries] (Plan& p) {
+ RefPtr<Plan> plan = makeRef(p);
+ p.vm().promiseDeferredTimer->scheduleWorkSoon(promise, [promise, instance, module, entries, plan = WTFMove(plan)] () {
+ ExecState* exec = instance->globalObject()->globalExec();
+ resolve(plan->vm(), exec, promise, instance, module, entries);
+ });
</ins><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -177,7 +179,7 @@
</span><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> instance->addUnitializedCodeBlock(vm, plan.copyRef());
</span><del>- plan->setModeAndPromise(instance->memoryMode(), promise);
</del><ins>+ plan->setMode(instance->memoryMode());
</ins><span class="cx"> Wasm::ensureWorklist().enqueue(WTFMove(plan));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>