-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.
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
re-add queuing for getResource calls #9031
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -110,40 +110,42 @@ class Actor { | |
cancel(); | ||
} | ||
} else { | ||
// In workers, store the tasks that we need to process before actually processing them. This | ||
// is necessary because we want to keep receiving messages, and in particular, | ||
// <cancel> messages. Some tasks may take a while in the worker thread, so before | ||
// executing the next task in our queue, postMessage preempts this and <cancel> | ||
// messages can be processed. We're using a MessageChannel object to get throttle the | ||
// process() flow to one at a time. | ||
this.tasks[id] = data; | ||
this.taskQueue.push(id); | ||
if (isWorker()) { | ||
if (isWorker() || data.type === 'getResource') { | ||
// In workers, store the tasks that we need to process before actually processing them. This | ||
// is necessary because we want to keep receiving messages, and in particular, | ||
// <cancel> messages. Some tasks may take a while in the worker thread, so before | ||
// executing the next task in our queue, postMessage preempts this and <cancel> | ||
// messages can be processed. We're using a MessageChannel object to get throttle the | ||
// process() flow to one at a time. | ||
this.tasks[id] = data; | ||
this.taskQueue.push(id); | ||
this.invoker.trigger(); | ||
} else { | ||
// In the main thread, process messages immediately so that other work does not slip in | ||
// between getting partial data back from workers. | ||
this.process(); | ||
this.process(id, data); | ||
} | ||
} | ||
} | ||
|
||
process() { | ||
if (!this.taskQueue.length) { | ||
return; | ||
} | ||
const id = this.taskQueue.shift(); | ||
const task = this.tasks[id]; | ||
delete this.tasks[id]; | ||
// Schedule another process call if we know there's more to process _before_ invoking the | ||
// current task. This is necessary so that processing continues even if the current task | ||
// doesn't execute successfully. | ||
if (this.taskQueue.length) { | ||
this.invoker.trigger(); | ||
} | ||
if (!task) { | ||
// If the task ID doesn't have associated task data anymore, it was canceled. | ||
return; | ||
process(id: number, task: any) { | ||
if (id === undefined && task === undefined) { | ||
if (!this.taskQueue.length) { | ||
return; | ||
} | ||
id = this.taskQueue.shift(); | ||
task = this.tasks[id]; | ||
delete this.tasks[id]; | ||
// Schedule another process call if we know there's more to process _before_ invoking the | ||
// current task. This is necessary so that processing continues even if the current task | ||
// doesn't execute successfully. | ||
if (this.taskQueue.length) { | ||
this.invoker.trigger(); | ||
} | ||
if (!task) { | ||
// If the task ID doesn't have associated task data anymore, it was canceled. | ||
return; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's separate this into two functions There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done in d28ac56 |
||
} | ||
|
||
if (task.type === '<response>') { | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of hardcoding the name of the message, can we find another way of marking tasks as immedidate vs. queueable, e.g. by checking for
!data.immediate
here, and addingimmediate as another argument to
Actor#send`?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done in d28ac56