Skip to content

Fix GetGenerationBounds under USE_REGIONS - #57101

Merged
cshung merged 9 commits into
dotnet:mainfrom
cshung:private/regions-profiler
Aug 27, 2021
Merged

Fix GetGenerationBounds under USE_REGIONS#57101
cshung merged 9 commits into
dotnet:mainfrom
cshung:private/regions-profiler

Conversation

@cshung

@cshungcshung commented Aug 9, 2021

Copy link
Copy Markdown
Contributor

Fixes#55965.

@ghostghost added the area-GC-coreclr label Aug 9, 2021
@ghost

ghost commented Aug 9, 2021

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/gc
See info in area-owners.md if you want to be subscribed.

Issue Details

Do not merge, this is currently a work-in-progress.

Author:cshung
Assignees:-
Labels:

area-GC-coreclr

Milestone:-

Comment threadsrc/coreclr/gc/gc.cpp Outdated
@cshungcshung changed the title [WIP] Fix GetGenerationBounds under USE_REGIONSFix GetGenerationBounds under USE_REGIONSAug 21, 2021
@cshung
cshung requested review from Maoni0 and davmasonAugust 21, 2021 01:54
Comment threadsrc/coreclr/gc/gc.cpp Outdated
Comment threadsrc/coreclr/gc/gc.cpp Outdated
Comment threadsrc/coreclr/gc/gc.cpp Outdated
Comment threadsrc/coreclr/gc/gc.cpp Outdated
Comment threadsrc/coreclr/gc/gc.cpp Outdated
Comment threadsrc/coreclr/vm/eeprofinterfaces.h Outdated
@cshung
cshungforce-pushed the private/regions-profiler branch from d384b9a to a39f5b2CompareAugust 24, 2021 19:04
Comment threadsrc/coreclr/gc/gc.cpp Outdated
@Maoni0

Copy link
Copy Markdown
Member

I haven't really looked at the changes in proftoeeinterfaceimpl.cpp, I'll defer to @davmason.

Comment threadsrc/coreclr/vm/proftoeeinterfaceimpl.cpp Outdated
Comment threadsrc/coreclr/vm/proftoeeinterfaceimpl.cpp Outdated
Comment threadsrc/coreclr/vm/proftoeeinterfaceimpl.cpp Outdated
@cshung
cshungforce-pushed the private/regions-profiler branch 2 times, most recently from e832f3d to 365a2f2CompareAugust 25, 2021 15:56

@davmasondavmason left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the minor things I made comments on, otherwise looks good to me. Thanks Andrew!

Comment threadsrc/coreclr/vm/proftoeeinterfaceimpl.cpp Outdated
Comment threadsrc/coreclr/gc/gc.cpp Outdated
@cshung
cshungforce-pushed the private/regions-profiler branch from 43020c6 to 9aaba6dCompareAugust 26, 2021 21:38
Comment threadsrc/coreclr/gc/gc.cpp
@cshung
cshung merged commit a18bb6c into dotnet:mainAug 27, 2021
@cshung
cshung deleted the private/regions-profiler branch August 27, 2021 16:26
@cshung

Copy link
Copy Markdown
ContributorAuthor

/backport to release/6.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1174937983

@github-actions

Copy link
Copy Markdown
Contributor

@cshung backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: DiagAddNewRegion prototype
Applying: Updating the table directly under a lock
error: sha1 information is lacking or useless (src/coreclr/gc/gc.cpp).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Updating the table directly under a lock
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

cshung added a commit to cshung/runtime that referenced this pull request Aug 27, 2021
@ghostghost locked as resolved and limited conversation to collaborators Sep 26, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Regions] pCorProfilerInfo->GetObjectGeneration may fail when running under USE_REGIONS

4 participants

@cshung@Maoni0@am11@davmason