Skip to content

Fix Dynamic Symbol Resolution for Mappings Shared Across Multiple Processes in Universal Traces #2380

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
brianrob merged 1 commit into from
Mar 16, 2026
Merged

Fix Dynamic Symbol Resolution for Mappings Shared Across Multiple Processes in Universal Traces #2380

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
16 changes: 12 additions & 4 deletions src/TraceEvent/SourceConverters/NettraceUniversalConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal sealed class NettraceUniversalConverter
private const string DotnetJittedCodeMappingName = "/memfd:doublemapper";

private List<ProcessSymbolTraceData> _dynamicSymbols = new List<ProcessSymbolTraceData>();
private Dictionary<ulong, TraceProcess> _mappingIdToProcesses = new Dictionary<ulong, TraceProcess>();
private Dictionary<ulong, HashSet<TraceProcess>> _mappingIdToProcesses = new Dictionary<ulong, HashSet<TraceProcess>>();
private Dictionary<ulong, ProcessMappingMetadataTraceData> _mappingMetadata = new Dictionary<ulong, ProcessMappingMetadataTraceData>();

internal NettraceUniversalConverter()
Expand Down Expand Up @@ -46,7 +46,12 @@ public void BeforeProcess(TraceLog traceLog, TraceEventDispatcher source)
universalSystemParser.ProcessMapping += delegate (ProcessMappingTraceData data)
{
TraceProcess process = traceLog.Processes.GetOrCreateProcess(data.ProcessID, data.TimeStampQPC);
_mappingIdToProcesses[data.Id] = process;
if (!_mappingIdToProcesses.TryGetValue(data.Id, out HashSet<TraceProcess> processes))
{
processes = new HashSet<TraceProcess>();
_mappingIdToProcesses[data.Id] = processes;
}
processes.Add(process);

if (!string.IsNullOrEmpty(data.FileName) && data.FileName.StartsWith(DotnetJittedCodeMappingName, StringComparison.Ordinal))
{
Expand Down Expand Up @@ -80,9 +85,12 @@ public void AfterProcess(TraceLog traceLog)
{
foreach (var universalProcessSymbol in _dynamicSymbols)
{
if (_mappingIdToProcesses.TryGetValue(universalProcessSymbol.MappingId, out TraceProcess process))
if (_mappingIdToProcesses.TryGetValue(universalProcessSymbol.MappingId, out HashSet<TraceProcess> processes))
{
traceLog.CodeAddresses.AddUniversalDynamicSymbol(universalProcessSymbol, process);
foreach (TraceProcess process in processes)
{
traceLog.CodeAddresses.AddUniversalDynamicSymbol(universalProcessSymbol, process);
}
}
}
}
Expand Down
Loading