Skip to content
Merged
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
15 changes: 12 additions & 3 deletions LTTngDataExtensions/Tables/ExecutionEventTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public static void BuildTable(ITableBuilder tableBuilder, IDataExtensionRetrieva
table.AddColumn(previousPidColumn, Projection.CreateUsingFuncAdaptor((i) => threads[i].PreviousPid));
table.AddColumn(instructionCountColumn, Projection.CreateUsingFuncAdaptor((i) => GetPerformanceCounterDiff(threads[i], "_perf_cpu_instructions")));
table.AddColumn(lastLevelCacheMissesColumn, Projection.CreateUsingFuncAdaptor((i) => GetPerformanceCounterDiff(threads[i], "_perf_cpu_LLC_load_misses")));
table.AddColumn(cpuCycleColumn, Projection.CreateUsingFuncAdaptor((i) => GetPerformanceCounterDiff(threads[i], "_perf_cpu_cpu_cycles")));
table.AddColumn(cpuCycleColumn, Projection.CreateUsingFuncAdaptor((i) => GetPerformanceCounterDiff(threads[i], "_perf_cpu_cpu_cycles", "_perf_cpu_cycles")));
table.AddColumn(cacheMissesColumn, Projection.CreateUsingFuncAdaptor((i) => GetPerformanceCounterDiff(threads[i], "_perf_cpu_cache_misses")));
table.AddColumn(nextCommandColumn, Projection.CreateUsingFuncAdaptor((i) => threads[i].NextImage));
table.AddColumn(previousCommandColumn, Projection.CreateUsingFuncAdaptor((i) => threads[i].PreviousImage));
Expand All @@ -319,9 +319,18 @@ public static void BuildTable(ITableBuilder tableBuilder, IDataExtensionRetrieva
table.AddColumn(percentCpuUsagePreset, percentCpuUsageColumn);
}

private static long GetPerformanceCounterDiff(IExecutionEvent executionEvent, string counterName)
// Some counters can be recorded under more than one name, e.g. "lttng add-context -t perf:cpu:cpu-cycles" vs "-t perf:cpu:cycles".
private static long GetPerformanceCounterDiff(IExecutionEvent executionEvent, params string[] counterNames)
{
return executionEvent.PerformanceCountersDiffByName.TryGetValue(counterName, out long value) ? value : 0;
foreach (var counterName in counterNames)
{
if (executionEvent.PerformanceCountersDiffByName.TryGetValue(counterName, out long value))
{
return value;
}
}

return 0;
}
}

Expand Down
Loading