Skip to content

fix(android): setInterval impl to match c++ and prevent drift #10787

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(android): setInterval impl to match c++ and prevent drift #10787

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
27 changes: 19 additions & 8 deletions packages/core/timer/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,35 @@ export function clearTimeout(id: number): void {
}

export function setInterval(callback: Function, milliseconds = 0, ...args): number {
// Cast to Number
milliseconds += 0;

const id = createHandlerAndGetId();
const handler = timeoutHandler;
const invoke = () => callback(...args);
const zoneBound = zonedCallback(invoke);
const startOffset = milliseconds > 0 ? Date.now() % milliseconds : 0;
function nextCallMs() {
return milliseconds > 0 ? milliseconds - ((Date.now() - startOffset) % milliseconds) : milliseconds;
}
let nextDueTime = Date.now() + milliseconds;

const runnable = new java.lang.Runnable({
run: () => {
const executionStart = Date.now();
zoneBound();

if (timeoutCallbacks[id]) {
handler.postDelayed(runnable, long(nextCallMs()));
const executionTime = Date.now() - executionStart;

// Update the next due time based on when this callback was supposed to execute
nextDueTime += milliseconds;

// If the callback took longer than the interval, skip ahead to avoid catch-up
const now = Date.now();
if (nextDueTime <= now) {
// Calculate how many intervals we should skip
const missedIntervals = Math.floor((now - nextDueTime) / milliseconds);
nextDueTime += (missedIntervals + 1) * milliseconds;
}

const delay = Math.max(0, nextDueTime - now);
handler.postDelayed(runnable, long(delay));
}
},
});
Expand All @@ -84,8 +96,7 @@ export function setInterval(callback: Function, milliseconds = 0, ...args): numb
timeoutCallbacksCb[id] = callback;
}

timeoutHandler.postDelayed(runnable, long(nextCallMs()));

handler.postDelayed(runnable, long(milliseconds));
return id;
}

Expand Down
Loading