mirror of
https://github.com/denoland/deno.git
synced 2024-12-24 08:09:08 -05:00
perf(ext/web): optimize timer cancellation (#16316)
Towards #16315 It created a bunch of Error objects and rejected the promise. This patch changes `op_sleep` to resolve with `true` if it was cancelled.
This commit is contained in:
parent
e41af14b2a
commit
4c9dd33e27
2 changed files with 12 additions and 14 deletions
|
@ -18,7 +18,6 @@
|
|||
// deno-lint-ignore camelcase
|
||||
NumberPOSITIVE_INFINITY,
|
||||
PromisePrototypeThen,
|
||||
ObjectPrototypeIsPrototypeOf,
|
||||
SafeArrayIterator,
|
||||
SymbolFor,
|
||||
TypeError,
|
||||
|
@ -245,7 +244,12 @@
|
|||
// 1.
|
||||
PromisePrototypeThen(
|
||||
sleepPromise,
|
||||
() => {
|
||||
(cancelled) => {
|
||||
if (!cancelled) {
|
||||
// The timer was cancelled.
|
||||
removeFromScheduledTimers(timerObject);
|
||||
return;
|
||||
}
|
||||
// 2. Wait until any invocations of this algorithm that had the same
|
||||
// global and orderingIdentifier, that started before this one, and
|
||||
// whose milliseconds is equal to or less than this one's, have
|
||||
|
@ -278,14 +282,6 @@
|
|||
currentEntry = currentEntry.next;
|
||||
}
|
||||
},
|
||||
(err) => {
|
||||
if (ObjectPrototypeIsPrototypeOf(core.InterruptedPrototype, err)) {
|
||||
// The timer was cancelled.
|
||||
removeFromScheduledTimers(timerObject);
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -77,15 +77,17 @@ pub fn op_timer_handle(state: &mut OpState) -> ResourceId {
|
|||
|
||||
/// Waits asynchronously until either `millis` milliseconds have passed or the
|
||||
/// [`TimerHandle`] resource given by `rid` has been canceled.
|
||||
///
|
||||
/// If the timer is canceled, this returns `false`. Otherwise, it returns `true`.
|
||||
#[op(deferred)]
|
||||
pub async fn op_sleep(
|
||||
state: Rc<RefCell<OpState>>,
|
||||
millis: u64,
|
||||
rid: ResourceId,
|
||||
) -> Result<(), AnyError> {
|
||||
) -> Result<bool, AnyError> {
|
||||
let handle = state.borrow().resource_table.get::<TimerHandle>(rid)?;
|
||||
tokio::time::sleep(Duration::from_millis(millis))
|
||||
let res = tokio::time::sleep(Duration::from_millis(millis))
|
||||
.or_cancel(handle.0.clone())
|
||||
.await?;
|
||||
Ok(())
|
||||
.await;
|
||||
Ok(res.is_ok())
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue