-
Notifications
You must be signed in to change notification settings - Fork 10.3k
[Blazor][Fixes #11964] Limit the amount of pending renders #12763
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
Merged
+384
−47
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
338904c
[Blazor][Fixes #11964] Limit the amount of pending renders
javiercn 27fd01c
Cleanups
javiercn 84493f0
More cleanups
javiercn 733a446
Apply suggestions from code review
javiercn e201725
Fix compilation error
javiercn b2eb95b
Address feedback
javiercn 2a555e5
Update public API
javiercn 56397a2
Cleanups
javiercn 9ea2803
Cleanups
javiercn 3dc9912
Cleanups
javiercn e00bd3d
Update ref assemblies
javiercn 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 hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
---|---|---|
|
@@ -243,7 +243,7 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo fiel | |
|
||
// Since the task has yielded - process any queued rendering work before we return control | ||
// to the caller. | ||
ProcessRenderQueue(); | ||
ProcessPendingRender(); | ||
} | ||
|
||
// Task completed synchronously or is still running. We already processed all of the rendering | ||
|
@@ -334,7 +334,7 @@ internal void AssignEventHandlerId(ref RenderTreeFrame frame) | |
/// </summary> | ||
/// <param name="componentId">The ID of the component to render.</param> | ||
/// <param name="renderFragment">A <see cref="RenderFragment"/> that will supply the updated UI contents.</param> | ||
protected internal virtual void AddToRenderQueue(int componentId, RenderFragment renderFragment) | ||
internal void AddToRenderQueue(int componentId, RenderFragment renderFragment) | ||
{ | ||
EnsureSynchronizationContext(); | ||
|
||
|
@@ -351,7 +351,7 @@ protected internal virtual void AddToRenderQueue(int componentId, RenderFragment | |
|
||
if (!_isBatchInProgress) | ||
{ | ||
ProcessRenderQueue(); | ||
ProcessPendingRender(); | ||
} | ||
} | ||
|
||
|
@@ -398,13 +398,27 @@ private ComponentState GetOptionalComponentState(int componentId) | |
? componentState | ||
: null; | ||
|
||
/// <summary> | ||
/// Processses pending renders requests from components if there are any. | ||
/// </summary> | ||
protected virtual void ProcessPendingRender() | ||
{ | ||
ProcessRenderQueue(); | ||
} | ||
|
||
private void ProcessRenderQueue() | ||
{ | ||
EnsureSynchronizationContext(); | ||
_isBatchInProgress = true; | ||
var updateDisplayTask = Task.CompletedTask; | ||
|
||
try | ||
{ | ||
if (_batchBuilder.ComponentRenderQueue.Count == 0) | ||
{ | ||
return; | ||
} | ||
javiercn marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// Process render queue until empty | ||
while (_batchBuilder.ComponentRenderQueue.Count > 0) | ||
{ | ||
|
@@ -423,6 +437,7 @@ private void ProcessRenderQueue() | |
{ | ||
// Ensure we catch errors while running the render functions of the components. | ||
HandleException(e); | ||
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. This was a bug. After an exception we should stop everything immediately and not run anything else, like the code after this try..catch..finally block. |
||
} | ||
finally | ||
{ | ||
|
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
This can go into
ProcessPendingRender
, since that's the external entrypoint, right?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.
I thought it couldn't because it was on the virtual method, but not that I think again it can, as people is forced to invoke the base to do any meaningful work.
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.
I'll change this in a separate PR as I don't want to re-run the build