Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/coreclr/inc/sospriv.idl
Original file line number Diff line number Diff line change
Expand Up @@ -655,4 +655,5 @@ interface ISOSDacInterface17 : IUnknown
HRESULT GetStressLogThreadEnumerator([out] ISOSStressLogThreadEnum **ppEnum);
HRESULT GetStressLogMessageEnumerator([in] CLRDATA_ADDRESS threadStressLogAddress,
[out] ISOSStressLogMsgEnum **ppEnum);
HRESULT GetStressLogMemoryRanges([out] ISOSMemoryEnum **ppEnum);
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ public record struct StressMsgData(
ulong Timestamp,
IReadOnlyList<TargetPointer> Args);

public record struct StressLogMemoryRange(
TargetPointer Start,
ulong Size);

public interface IStressLog : IContract
{
static string IContract.Name { get; } = nameof(StressLog);
Expand All @@ -42,6 +46,7 @@ public interface IStressLog : IContract
IEnumerable<ThreadStressLogData> GetThreadStressLogs(TargetPointer Logs) => throw new NotImplementedException();
IEnumerable<StressMsgData> GetStressMessages(ThreadStressLogData threadLog) => throw new NotImplementedException();
bool IsPointerInStressLog(StressLogData stressLog, TargetPointer pointer) => throw new NotImplementedException();
IEnumerable<StressLogMemoryRange> GetStressLogMemoryRanges(StressLogData stressLog) => throw new NotImplementedException();
Comment thread
max-charlamb marked this conversation as resolved.
}

public readonly struct StressLog : IStressLog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ public bool IsPointerInStressLog(StressLogData stressLog, TargetPointer pointer)
return false;
}

public IEnumerable<StressLogMemoryRange> GetStressLogMemoryRanges(StressLogData stressLog)
{
ulong chunkSize = target.GetTypeInfo(DataType.StressLogChunk).Size!.Value;
StressLogMemory stressLogMemory = target.ProcessedData.GetOrAdd<StressLogMemory>(stressLog.Logs);
foreach (TargetPointer chunk in stressLogMemory.Chunks)
{
yield return new StressLogMemoryRange(chunk, chunkSize);
}
}

private sealed class StressLogMemory(IReadOnlyList<TargetPointer> chunks) : Data.IData<StressLogMemory>
{
public static StressLogMemory Create(Target target, TargetPointer address)
Expand Down Expand Up @@ -343,6 +353,7 @@ internal sealed class StressLog_1(Target target) : IStressLog
public IEnumerable<ThreadStressLogData> GetThreadStressLogs(TargetPointer Logs) => traversal.GetThreadStressLogs(Logs);
public IEnumerable<StressMsgData> GetStressMessages(ThreadStressLogData threadLog) => traversal.GetStressMessages(threadLog);
public bool IsPointerInStressLog(StressLogData stressLog, TargetPointer pointer) => traversal.IsPointerInStressLog(stressLog, pointer);
public IEnumerable<StressLogMemoryRange> GetStressLogMemoryRanges(StressLogData stressLog) => traversal.GetStressLogMemoryRanges(stressLog);
}


Expand All @@ -356,4 +367,5 @@ internal sealed class StressLog_2(Target target) : IStressLog
public IEnumerable<ThreadStressLogData> GetThreadStressLogs(TargetPointer Logs) => traversal.GetThreadStressLogs(Logs);
public IEnumerable<StressMsgData> GetStressMessages(ThreadStressLogData threadLog) => traversal.GetStressMessages(threadLog);
public bool IsPointerInStressLog(StressLogData stressLog, TargetPointer pointer) => traversal.IsPointerInStressLog(stressLog, pointer);
public IEnumerable<StressLogMemoryRange> GetStressLogMemoryRanges(StressLogData stressLog) => traversal.GetStressLogMemoryRanges(stressLog);
}
Original file line number Diff line number Diff line change
Expand Up @@ -1266,4 +1266,8 @@ int GetStressLogMessageEnumerator(
ClrDataAddress threadStressLogAddress,
DacComNullableByRef<ISOSStressLogMsgEnum> ppEnum);

[PreserveSig]
int GetStressLogMemoryRanges(
DacComNullableByRef<ISOSMemoryEnum> ppEnum);

}
Original file line number Diff line number Diff line change
Expand Up @@ -1745,6 +1745,12 @@ public SOSMemoryEnum(Target target, IReadOnlyList<GCMemoryRegionData> regions, I
}
}

public SOSMemoryEnum(SOSMemoryRegion[] regions, ISOSMemoryEnum? legacyMemoryEnum = null)
{
_regions = regions;
_legacyMemoryEnum = legacyMemoryEnum;
}

int ISOSMemoryEnum.Next(uint count, SOSMemoryRegion[] memRegions, uint* pNeeded)
{
int hr = HResults.S_OK;
Expand Down Expand Up @@ -7348,5 +7354,35 @@ int ISOSDacInterface17.GetStressLogMessageEnumerator(
return hr;
}

int ISOSDacInterface17.GetStressLogMemoryRanges(DacComNullableByRef<ISOSMemoryEnum> ppEnum)
{
int hr = HResults.S_OK;
try
{
Contracts.IStressLog stressLogContract = _target.Contracts.StressLog;
if (!stressLogContract.HasStressLog())
return HResults.S_FALSE;

Contracts.StressLogData logData = stressLogContract.GetStressLogData();

SOSMemoryRegion[] regions = stressLogContract.GetStressLogMemoryRanges(logData)
.Select(r => new SOSMemoryRegion
{
Start = r.Start.ToClrDataAddress(_target),
Size = (ClrDataAddress)r.Size,
ExtraData = default,
Heap = 0,
})
.ToArray();
ppEnum.Interface = new SOSMemoryEnum(regions);
Comment thread
max-charlamb marked this conversation as resolved.
}
catch (System.Exception ex)
{
hr = ex.HResult;
}

return hr;
}

#endregion ISOSDacInterface17
}
Loading