Fix msl wait time extraction in GC - #135022
Merged
janvorli merged 1 commit intoOct 2, 2026
Merged
Conversation
There is a bug in the gc_heap::get_msl_wait_time implementation that was introduced in .NET 9. The function has two output arguments soh_msl_wait_time and uoh_msl_wait_time, but instead of updating the values these args point to, it updates the args themselves. So it never reads out any value. This change fixes it. Close dotnet#134492
Contributor
|
Tagging subscribers to this area: @anicka-net, @dotnet/gc |
|
Azure Pipelines: Successfully started running 3 pipeline(s). 13 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
kkokosa
approved these changes
Oct 2, 2026
Member
Author
|
/backport to release/11.0 |
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/10.0 |
Contributor
|
Started backporting to |
4 tasks
Contributor
|
@janvorli backporting to git am output$ git cherry-pick 097dbabb2ce276f44a682c7a29d345443f993239
CONFLICT (modify/delete): src/coreclr/gc/dynamic_heap_count.cpp deleted in HEAD and modified in 097dbabb2ce (Fix msl wait time extraction in GC (#135022)). Version 097dbabb2ce (Fix msl wait time extraction in GC (#135022)) of src/coreclr/gc/dynamic_heap_count.cpp left in tree.
error: could not apply 097dbabb2ce... Fix msl wait time extraction in GC (#135022)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix msl wait time extraction in GC
Using index info to reconstruct a base tree...
A src/coreclr/gc/dynamic_heap_count.cpp
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/coreclr/gc/dynamic_heap_count.cpp deleted in HEAD and modified in Fix msl wait time extraction in GC. Version Fix msl wait time extraction in GC of src/coreclr/gc/dynamic_heap_count.cpp left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix msl wait time extraction in GC
Error: The process '/usr/bin/git' failed with exit code 128 |
This was referenced Oct 2, 2026
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
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.
There is a bug in the gc_heap::get_msl_wait_time implementation that was introduced in .NET 9. The function has two output arguments soh_msl_wait_time and uoh_msl_wait_time, but instead of updating the values these args point to, it updates the args themselves. So it never reads out any value.
This change fixes it.
Close #134492