chore: migrate from timeouts to deadlines internally #1695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgozman
approved these changes
Apr 7, 2020
src/frames.ts
Outdated
| @@ -760,8 +763,8 @@ export class Frame { | |||
| const task = async (context: dom.FrameExecutionContext) => context.evaluateHandleInternal(({ injected, predicateBody, polling, timeout, arg }) => { | |||
| const innerPredicate = new Function('arg', predicateBody); | |||
| return injected.poll(polling, timeout, () => innerPredicate(arg)); | |||
| }, { injected: await context._injected(), predicateBody, polling, timeout, arg }); | |||
| return this._scheduleRerunnableTask(task, 'main', timeout) as any as types.SmartHandle<R>; | |||
| }, { injected: await context._injected(), predicateBody, polling, timeout: deadline - helper.monotonicTime(), arg }); | |||
src/frames.ts
Outdated
| this._timeoutTimer = setTimeout(() => this.terminate(timeoutError), timeout); | ||
| } | ||
| const timeoutError = new TimeoutError(`waiting for ${title || 'function'} failed: timeout exceeded`); | ||
| this._timeoutTimer = setTimeout(() => this.terminate(timeoutError), deadline - helper.monotonicTime()); |
pavelfeldman
force-pushed
the
deadline
branch
2 times, most recently
from
9516af5
to
9d559e3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses timeout aspect of #1669