Skip to content

gh-138122: Allow to filter by thread in tachyon's flamegraph #139216

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
pablogsal merged 4 commits into from
Sep 25, 2025
Merged

gh-138122: Allow to filter by thread in tachyon's flamegraph #139216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1e1a0e
gh-138122: Allow to filter by thread in tachyon's flamegraph
pablogsal Sep 21, 2025
3ec314d
Simplify
pablogsal Sep 21, 2025
1a86c1b
Fix tests
pablogsal Sep 21, 2025
1e96289
Address code review
pablogsal Sep 25, 2025
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
Next Next commit
Simplify
  • Loading branch information
@pablogsal
pablogsal committed Sep 21, 2025
commit 3ec314d20ee6d2c196d4bc143c63c8a0fe2d0719
54 changes: 8 additions & 46 deletions Lib/profiling/sampling/flamegraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,26 +403,14 @@ function populateStats(data) {
const functionMap = new Map();

function collectFunctions(node) {
// Debug to understand the node structure
if (!node) return;

// Try multiple ways to get the filename and function name
let filename = node.filename;
let funcname = node.funcname || node.name;
let filename = typeof node.filename === 'number' ? resolveString(node.filename) : node.filename;
let funcname = typeof node.funcname === 'number' ? resolveString(node.funcname) : node.funcname;

// If they're numbers (string indices), resolve them
if (typeof filename === 'number') {
filename = resolveString(filename);
}
if (typeof funcname === 'number') {
funcname = resolveString(funcname);
}

// If they're still undefined or null, try extracting from the name field
if (!filename && node.name) {
if (!filename || !funcname) {
const nameStr = typeof node.name === 'number' ? resolveString(node.name) : node.name;
if (nameStr && nameStr.includes('(')) {
// Parse format: "funcname (filename:lineno)"
if (nameStr?.includes('(')) {
const match = nameStr.match(/^(.+?)\s*\((.+?):(\d+)\)$/);
if (match) {
funcname = funcname || match[1];
Expand All @@ -431,7 +419,6 @@ function populateStats(data) {
}
}

// Final fallback
filename = filename || 'unknown';
funcname = funcname || 'unknown';

Expand Down Expand Up @@ -486,10 +473,9 @@ function populateStats(data) {
const num = i + 1;
if (i < hotSpots.length && hotSpots[i]) {
const hotspot = hotSpots[i];
// Safe extraction with fallbacks
const filename = hotspot.filename || 'unknown';
const basename = filename !== 'unknown' ? filename.split('/').pop() : 'unknown';
const lineno = hotspot.lineno !== undefined && hotspot.lineno !== null ? hotspot.lineno : '?';
const lineno = hotspot.lineno ?? '?';
let funcDisplay = hotspot.funcname || 'unknown';
if (funcDisplay.length > 35) {
funcDisplay = funcDisplay.substring(0, 32) + '...';
Expand Down Expand Up @@ -591,7 +577,6 @@ function filterByThread() {
const threadId = parseInt(selectedThread);
filteredData = filterDataByThread(originalData, threadId);

// Ensure string indices are resolved for the filtered data
if (filteredData.strings) {
stringTable = filteredData.strings;
filteredData = resolveStringIndices(filteredData);
Expand All @@ -605,33 +590,16 @@ function filterByThread() {
}

function filterDataByThread(data, threadId) {
// Deep clone the data structure and filter by thread
function filterNode(node) {
// Check if this node contains the thread
if (!node.threads || !node.threads.includes(threadId)) {
return null;
}

// Create a filtered copy of the node, preserving all fields
const filteredNode = {
name: node.name,
value: node.value,
filename: node.filename,
funcname: node.funcname,
lineno: node.lineno,
threads: node.threads,
source: node.source,
...node,
children: []
};

// Copy any other properties that might exist
Object.keys(node).forEach(key => {
if (!(key in filteredNode)) {
filteredNode[key] = node[key];
}
});

// Recursively filter children
if (node.children && Array.isArray(node.children)) {
filteredNode.children = node.children
.map(child => filterNode(child))
Expand All @@ -641,28 +609,22 @@ function filterDataByThread(data, threadId) {
return filteredNode;
}

// Create filtered root, preserving all metadata
const filteredRoot = {
...data,
children: [],
strings: data.strings // Preserve string table
children: []
};

// Filter children
if (data.children && Array.isArray(data.children)) {
filteredRoot.children = data.children
.map(child => filterNode(child))
.filter(child => child !== null);
}

// Recalculate total value based on filtered children
function recalculateValue(node) {
if (!node.children || node.children.length === 0) {
return node.value || 0;
}
const childrenValue = node.children.reduce((sum, child) => {
return sum + recalculateValue(child);
}, 0);
const childrenValue = node.children.reduce((sum, child) => sum + recalculateValue(child), 0);
node.value = Math.max(node.value || 0, childrenValue);
return node.value;
}
Expand Down
2 changes: 1 addition & 1 deletion Lib/profiling/sampling/stack_collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def convert_children(children, min_samples):
"filename": filename_idx,
"lineno": func[1],
"funcname": funcname_idx,
"threads": list(node.get("threads", set())),
"threads": sorted(list(node.get("threads", set()))),
}

source = self._get_source_lines(func)
Expand Down