Rename module_name/name_module to module/label in flamegraph data

Author: ivonastojanovic

Lib/profiling/sampling/_flamegraph_assets/flamegraph.js

@@ -65,11 +65,11 @@ function resolveStringIndices(node, table) {
   if (typeof resolved.funcname === 'number') {
     resolved.funcname = resolveString(resolved.funcname, table);
   }
-  if (typeof resolved.module_name === 'number') {
-    resolved.module_name = resolveString(resolved.module_name);
+  if (typeof resolved.module === 'number') {
+    resolved.module = resolveString(resolved.module, table);
   }
-  if (typeof resolved.name_module === 'number') {
-    resolved.name_module = resolveString(resolved.name_module);
+  if (typeof resolved.label === 'number') {
+    resolved.label = resolveString(resolved.label, table);
   }
 
   if (Array.isArray(resolved.source)) {
@@ -90,7 +90,7 @@ function escapeHtml(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
-// Get display path based on user preference (module name or basename)
+// Get display path based on user preference (module or full path)
 function getDisplayName(moduleName, filename) {
   if (useModuleNames) {
     return moduleName || filename;
@@ -248,7 +248,7 @@ function setupLogos() {
 function updateStatusBar(nodeData, rootValue) {
   const funcname = resolveString(nodeData.funcname) || resolveString(nodeData.name) || "--";
   const filename = resolveString(nodeData.filename) || "";
-  const moduleName = resolveString(nodeData.module_name) || "";
+  const moduleName = resolveString(nodeData.module) || "";
   const lineno = nodeData.lineno;
   const timeMs = (nodeData.value / 1000).toFixed(2);
   const percent = rootValue > 0 ? ((nodeData.value / rootValue) * 100).toFixed(1) : "0.0";
@@ -320,7 +320,7 @@ function createPythonTooltip(data) {
 
     const funcname = resolveString(d.data.funcname) || resolveString(d.data.name);
     const filename = resolveString(d.data.filename) || "";
-    const moduleName = resolveString(d.data.module_name) || "";
+    const moduleName = resolveString(d.data.module) || "";
     const displayName = escapeHtml(useModuleNames ? (moduleName || filename) : filename);
     const isSpecialFrame = filename === "~";
 
@@ -602,7 +602,7 @@ function createFlamegraph(tooltip, rootValue, data) {
     .minFrameSize(1)
     .tooltip(tooltip)
     .inverted(true)
-    .getName(d => resolveString(useModuleNames ? d.data.name_module : d.data.name) || resolveString(d.data.name) || '')
+    .getName(d => resolveString(useModuleNames ? d.data.label : d.data.name) || resolveString(d.data.name) || '')
     .setColorMapper(function (d) {
       if (d.depth === 0) return 'transparent';
 
@@ -645,7 +645,7 @@ function updateSearchHighlight(searchTerm, searchInput) {
         const name = resolveString(d.data.name) || "";
         const funcname = resolveString(d.data.funcname) || "";
         const filename = resolveString(d.data.filename) || "";
-        const moduleName = resolveString(d.data.module_name) || "";
+        const moduleName = resolveString(d.data.module) || "";
         const displayName = getDisplayName(moduleName, filename);
         const lineno = d.data.lineno;
         const term = searchTerm.toLowerCase();
@@ -1064,7 +1064,7 @@ function populateStats(data) {
 
     let filename = resolveString(node.filename);
     let funcname = resolveString(node.funcname);
-    let moduleName = resolveString(node.module_name);
+    let moduleName = resolveString(node.module);
 
     if (!filename || !funcname) {
       const nameStr = resolveString(node.name);
@@ -1096,14 +1096,14 @@ function populateStats(data) {
         existing.directPercent = (existing.directSamples / totalSamples) * 100;
         if (directSamples > existing.maxSingleSamples) {
           existing.filename = filename;
-          existing.module_name = moduleName;
+          existing.module = moduleName;
           existing.lineno = node.lineno || '?';
           existing.maxSingleSamples = directSamples;
         }
       } else {
         functionMap.set(funcKey, {
           filename: filename,
-          module_name: moduleName,
+          module: moduleName,
           lineno: node.lineno || '?',
           funcname: funcname,
           directSamples,
@@ -1138,7 +1138,7 @@ function populateStats(data) {
       const h = hotSpots[i];
       const filename = h.filename || 'unknown';
       const lineno = h.lineno ?? '?';
-      const moduleName = h.module_name || 'unknown';
+      const moduleName = h.module || 'unknown';
       const isSpecialFrame = filename === '~' && (lineno === 0 || lineno === '?');
 
       let funcDisplay = h.funcname || 'unknown';
@@ -1166,7 +1166,7 @@ function populateStats(data) {
     if (card) {
       if (i < hotSpots.length && hotSpots[i]) {
         const h = hotSpots[i];
-        const moduleName = h.module_name || 'unknown';
+        const moduleName = h.module || 'unknown';
         const filename = h.filename || 'unknown';
         const displayName = getDisplayName(moduleName, filename);
         const hasValidLocation = displayName !== 'unknown' && h.lineno !== '?';
@@ -1302,11 +1302,11 @@ function accumulateInvertedNode(parent, stackFrame, leaf, isDifferential) {
   if (!parent.children[key]) {
     const newNode = {
       name: stackFrame.name,
-      name_module: stackFrame.name_module,
+      label: stackFrame.label,
       value: 0,
       children: {},
       filename: stackFrame.filename,
-      module_name: stackFrame.module_name,
+      module: stackFrame.module,
       lineno: stackFrame.lineno,
       funcname: stackFrame.funcname,
       source: stackFrame.source,
@@ -1400,7 +1400,7 @@ function generateInvertedFlamegraph(data) {
 
   const invertedRoot = {
     name: data.name,
-    name_module: data.name_module,
+    label: data.label,
     value: data.value,
     children: {},
     stats: data.stats,
@@ -1428,14 +1428,7 @@ function toggleInvert() {
 function togglePathDisplay() {
   useModuleNames = !useModuleNames;
   updateToggleUI('toggle-path-display', useModuleNames);
-  const dataToRender = isInverted ? invertedData : normalData;
-  const filteredData = currentThreadFilter !== 'all'
-    ? filterDataByThread(dataToRender, parseInt(currentThreadFilter))
-    : dataToRender;
-
-  const tooltip = createPythonTooltip(filteredData);
-  const chart = createFlamegraph(tooltip, filteredData.value);
-  renderFlamegraph(chart, filteredData);
+  updateFlamegraphView();
 }
 
 // ============================================================================

Lib/profiling/sampling/stack_collector.py

@@ -224,17 +224,17 @@ def convert_children(children, min_samples, path_info):
                 funcname_idx = self._string_table.intern(func[2])
                 module_name = self._get_module_name(func[0], path_info)
 
-                module_name_idx = self._string_table.intern(module_name)
+                module_idx = self._string_table.intern(module_name)
                 name_idx = self._string_table.intern(self._format_function_name(func))
-                name_module_idx = self._string_table.intern(self._format_module_name(func, module_name))
+                label_idx = self._string_table.intern(self._format_module_name(func, module_name))
 
                 child_entry = {
                     "name": name_idx,
-                    "name_module": name_module_idx,
+                    "label": label_idx,
                     "value": samples,
                     "children": [],
                     "filename": filename_idx,
-                    "module_name": module_name_idx,
+                    "module": module_idx,
                     "lineno": func[1],
                     "funcname": funcname_idx,
                     "threads": sorted(list(node.get("threads", set()))),