Skip to content

Support regions #945

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.

Sign up for GitHub

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
leculver merged 3 commits into from
Aug 23, 2021
Merged

Support regions #945

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5878eee
Support regions
cshung Aug 12, 2021
67d8067
Relaxing the test validation for regions
cshung Aug 16, 2021
6f3393a
Compute _sizeofPlugAndGap based on pointer size
cshung Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Compute _sizeofPlugAndGap based on pointer size
  • Loading branch information
@cshung
cshung committed Aug 18, 2021
commit 6f3393a6c393c52219748ecf3c18e2ea163c2a9d
2 changes: 1 addition & 1 deletion src/Microsoft.Diagnostics.Runtime/src/Builders/RuntimeBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ bool IHeapHelpers.CreateSegments(ClrHeap clrHeap, out ImmutableArray<ClrSegment>
}

bool result = false;
SegmentBuilder segBuilder = new SegmentBuilder(_sos);
SegmentBuilder segBuilder = new SegmentBuilder(_sos, DataReader.PointerSize);
if (clrHeap.IsServer)
{
ClrDataAddress[] heapList = _sos.GetHeapList(clrHeap.LogicalHeapCount);
Expand Down
9 changes: 5 additions & 4 deletions src/Microsoft.Diagnostics.Runtime/src/Builders/SegmentBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ internal sealed class SegmentBuilder : ISegmentData

// Regions only
private int _generation;
private ulong _sizeofPlugAndGap;

public SegmentBuilder(SOSDac sos)
public SegmentBuilder(SOSDac sos, int pointerSize)
{
_sos = sos;
_sizeofPlugAndGap = (ulong)pointerSize * 4;
}

public bool Initialize(ulong address, int generation, in HeapDetails heap)
Expand All @@ -48,9 +50,8 @@ public bool Initialize(ulong address, int generation, in HeapDetails heap)

#region ISegmentData
public int LogicalHeap { get; set; }

// 0x20 is sizeof(aligned_plug_and_gap)
public ulong BaseAddress => _regions ? (_segment.Start - 0x20) : _segment.Address;

public ulong BaseAddress => _regions ? (_segment.Start - _sizeofPlugAndGap) : _segment.Address;

public ulong Start => _segment.Start;

Expand Down