Skip to content

[cDAC] Add stackwalk DAC flags #131901

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
rcj1 merged 1 commit into from
Aug 6, 2026
Merged

[cDAC] Add stackwalk DAC flags #131901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/ClrDataStackWalk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ namespace Microsoft.Diagnostics.DataContractReader.Legacy;
public sealed unsafe partial class ClrDataStackWalk : IXCLRDataStackWalk
{
private readonly TargetPointer _threadAddr;
private readonly uint _flags;
private readonly CLRDataStackWalkFlag _flags;
private readonly Target _target;
private readonly IXCLRDataStackWalk? _legacyImpl;
private readonly ThreadData _threadData;

private bool _currentFrameIsValid;
private IEnumerator<IStackDataFrameHandle> _dataFrames;

public ClrDataStackWalk(TargetPointer threadAddr, uint flags, Target target, IXCLRDataStackWalk? legacyImpl)
public ClrDataStackWalk(TargetPointer threadAddr, CLRDataStackWalkFlag flags, Target target, IXCLRDataStackWalk? legacyImpl)
{
_threadAddr = threadAddr;
_flags = flags;
Expand Down Expand Up @@ -54,10 +54,10 @@ private bool MoveNextLegacyVisible()
return false;
}

internal static bool IsLegacyVisible(IStackDataFrameHandle frame)
internal bool IsLegacyVisible(IStackDataFrameHandle frame)
=> frame.State is StackWalkState.Frameless
or StackWalkState.Frame
or StackWalkState.SkippedFrame;
|| ((_flags & CLRDataStackWalkFlag.CLRDATA_SIMPFRAME_RUNTIME_UNMANAGED_CODE) != 0
&& frame.State is StackWalkState.Frame or StackWalkState.SkippedFrame);
Comment thread
rcj1 marked this conversation as resolved.

private void Reseed(byte[] context, bool isFirst)
{
Expand Down
2 changes: 1 addition & 1 deletion src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/ClrDataTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ int IXCLRDataTask.GetDesiredExecutionState(uint* state)
int IXCLRDataTask.SetDesiredExecutionState(uint state)
=> HResults.E_NOTIMPL;

int IXCLRDataTask.CreateStackWalk(uint flags, DacComNullableByRef<IXCLRDataStackWalk> stackWalk)
int IXCLRDataTask.CreateStackWalk(CLRDataStackWalkFlag flags, DacComNullableByRef<IXCLRDataStackWalk> stackWalk)
{
Contracts.ThreadData threadData = _target.Contracts.Thread.GetThreadData(_address);
if (threadData.State.HasFlag(Contracts.ThreadState.Unstarted))
Expand Down
8 changes: 7 additions & 1 deletion src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/IXCLRData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ public unsafe partial interface IXCLRDataTask
int SetDesiredExecutionState(uint state);

[PreserveSig]
int CreateStackWalk(uint flags, DacComNullableByRef<IXCLRDataStackWalk> stackWalk);
int CreateStackWalk(CLRDataStackWalkFlag flags, DacComNullableByRef<IXCLRDataStackWalk> stackWalk);
Comment thread
rcj1 marked this conversation as resolved.

[PreserveSig]
int GetOSThreadID(uint* id);
Expand Down Expand Up @@ -996,6 +996,12 @@ public enum CLRDataStackWalkRequest : uint
CLRDATA_STACK_WALK_REQUEST_SET_FIRST_FRAME = 0xe1000000,
}

[Flags]
public enum CLRDataStackWalkFlag : uint
{
CLRDATA_SIMPFRAME_RUNTIME_UNMANAGED_CODE = 0x8,
}
Comment thread
rcj1 marked this conversation as resolved.

[Flags]
public enum CLRDataStackSetContextFlag : uint
{
Expand Down
Loading