Skip to content

wasm: keep one pending scheduler wakeup instead of leaking a timer chain #5622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0pcom wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

wasm: keep one pending scheduler wakeup instead of leaking a timer chain #5622

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions targets/wasm_exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,24 @@

// func sleepTicks(timeout int64)
"runtime.sleepTicks": (timeout) => {
// Do not sleep, only reactivate scheduler after the given timeout.
setTimeout(() => {
// Do not sleep, only reactivate the scheduler after the given
// timeout, keeping exactly one pending wakeup.
const ms = Number(timeout) / 1e6;
const due = Date.now() + ms;
if (this._scheduledWakeup !== undefined) {
if (this._scheduledWakeupDue <= due) return;
clearTimeout(this._scheduledWakeup);
}
this._scheduledWakeupDue = due;
this._scheduledWakeup = setTimeout(() => {
this._scheduledWakeup = undefined;
if (this.exited) return;
try {
this._inst.exports.go_scheduler();
} catch (e) {
if (e !== wasmExit) throw e;
}
}, Number(timeout) / 1e6);
}, ms);
},

// func finalizeRef(v ref)
Expand Down Expand Up @@ -489,6 +498,12 @@
this._ids = new Map(); // mapping from JS values to reference ids
this._idPool = []; // unused ids that have been garbage collected
this.exited = false; // whether the Go program has exited
// A wakeup left pending by a previous run would otherwise suppress the
// first one this run asks for, and the scheduler would never start.
if (this._scheduledWakeup !== undefined) {
clearTimeout(this._scheduledWakeup);
this._scheduledWakeup = undefined;
}
this.exitCode = 0;
// syscall/js.handleEvent reads _pendingEvent and returns early only when
// it IsNull(). Leaving it `undefined` is not null, so handleEvent falls
Expand Down
Loading