@parca/profile 0.17.2 → 0.17.4

package/src/ProfileIcicleGraph/IcicleGraphArrow/index.tsx

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {memo, useCallback, useMemo, useRef, useState} from 'react';
 
 import {Dictionary, Table, Vector, tableFromIPC} from 'apache-arrow';
 import {useContextMenu} from 'react-contexify';
@@ -20,25 +20,24 @@ import {FlamegraphArrow} from '@parca/client';
 import {useURLState} from '@parca/components';
 import {USER_PREFERENCES, useCurrentColorProfile, useUserPreference} from '@parca/hooks';
 import {ProfileType} from '@parca/parser';
-import {
-  getColorForFeature,
-  selectDarkMode,
-  setHoveringNode,
-  useAppDispatch,
-  useAppSelector,
-} from '@parca/store';
-import {getLastItem, scaleLinear, type ColorConfig} from '@parca/utilities';
-
-import GraphTooltipArrow from '../../GraphTooltipArrow';
-import GraphTooltipArrowContent from '../../GraphTooltipArrow/Content';
-import {DockedGraphTooltip} from '../../GraphTooltipArrow/DockedGraphTooltip';
+import {getColorForFeature, selectDarkMode, useAppSelector} from '@parca/store';
+import {getLastItem, type ColorConfig} from '@parca/utilities';
+
 import {ProfileSource} from '../../ProfileSource';
 import {useProfileViewContext} from '../../ProfileView/context/ProfileViewContext';
-import ContextMenu from './ContextMenu';
-import {IcicleChartRootNode} from './IcicleChartRootNode';
+import ContextMenuWrapper, {ContextMenuWrapperRef} from './ContextMenuWrapper';
 import {IcicleNode, RowHeight, colorByColors} from './IcicleGraphNodes';
+import {MemoizedTooltip} from './MemoizedTooltip';
+import {TooltipProvider} from './TooltipContext';
 import {useFilenamesList} from './useMappingList';
-import {CurrentPathFrame, arrowToString, extractFeature, extractFilenameFeature} from './utils';
+import {
+  CurrentPathFrame,
+  arrowToString,
+  extractFeature,
+  extractFilenameFeature,
+  getCurrentPathFrameData,
+  isCurrentPathFrameMatch,
+} from './utils';
 
 export const FIELD_LABELS_ONLY = 'labels_only';
 export const FIELD_MAPPING_FILE = 'mapping_file';
@@ -58,18 +57,19 @@ export const FIELD_LABELS = 'labels';
 export const FIELD_CUMULATIVE = 'cumulative';
 export const FIELD_FLAT = 'flat';
 export const FIELD_DIFF = 'diff';
+export const FIELD_PARENT = 'parent';
+export const FIELD_DEPTH = 'depth';
+export const FIELD_VALUE_OFFSET = 'value_offset';
 
 interface IcicleGraphArrowProps {
   arrow: FlamegraphArrow;
   total: bigint;
   filtered: bigint;
   profileType?: ProfileType;
-  profileSource?: ProfileSource;
+  profileSource: ProfileSource;
   width?: number;
   curPath: CurrentPathFrame[];
   setCurPath: (path: CurrentPathFrame[]) => void;
-  sortBy: string;
-  flamegraphLoading: boolean;
   isHalfScreen: boolean;
   mappingsListFromMetadata: string[];
   compareAbsolute: boolean;
@@ -115,30 +115,21 @@ export const IcicleGraphArrow = memo(function IcicleGraphArrow({
   curPath,
   profileType,
   profileSource,
-  sortBy,
-  flamegraphLoading,
   mappingsListFromMetadata,
   compareAbsolute,
   isIcicleChart = false,
 }: IcicleGraphArrowProps): React.JSX.Element {
-  const [isContextMenuOpen, setIsContextMenuOpen] = useState<boolean>(false);
-  const dispatch = useAppDispatch();
   const [highlightSimilarStacksPreference] = useUserPreference<boolean>(
     USER_PREFERENCES.HIGHLIGHT_SIMILAR_STACKS.key
   );
+  const [hoveringRow, setHoveringRow] = useState<number | undefined>(undefined);
   const [dockedMetainfo] = useUserPreference<boolean>(USER_PREFERENCES.GRAPH_METAINFO_DOCKED.key);
   const isDarkMode = useAppSelector(selectDarkMode);
 
   const table: Table<any> = useMemo(() => {
     return tableFromIPC(arrow.record);
   }, [arrow]);
-
-  const [height, setHeight] = useState(0);
-  const [hoveringRow, setHoveringRow] = useState<number | null>(null);
-  const [hoveringLevel, setHoveringLevel] = useState<number | null>(null);
-  const [hoveringName, setHoveringName] = useState<string | null>(null);
   const svg = useRef(null);
-  const ref = useRef<SVGGElement>(null);
 
   const [binaryFrameFilter, setBinaryFrameFilter] = useURLState('binary_frame_filter');
 
@@ -200,29 +191,14 @@ export const IcicleGraphArrow = memo(function IcicleGraphArrow({
 
   const colorByColors: colorByColors = colorByList[colorByValue as ColorByKey];
 
-  useEffect(() => {
-    if (ref.current != null) {
-      setHeight(ref?.current.getBoundingClientRect().height);
-    }
-  }, [width, flamegraphLoading]);
-
-  const xScale = useMemo(() => {
-    if (total === 0n) {
-      return () => 0;
-    }
-
-    if (width === undefined) {
-      return () => 0;
-    }
-    return scaleLinear([0n, total], [0, width]);
-  }, [total, width]);
-
   const MENU_ID = 'icicle-graph-context-menu';
+  const contextMenuRef = useRef<ContextMenuWrapperRef>(null);
   const {show, hideAll} = useContextMenu({
     id: MENU_ID,
   });
   const displayMenu = useCallback(
-    (e: React.MouseEvent): void => {
+    (e: React.MouseEvent, row: number): void => {
+      contextMenuRef.current?.setRow(row);
       show({
         event: e,
       });
@@ -230,10 +206,6 @@ export const IcicleGraphArrow = memo(function IcicleGraphArrow({
     [show]
   );
 
-  const trackVisibility = (isVisible: boolean): void => {
-    setIsContextMenuOpen(isVisible);
-  };
-
   const hideBinary = (binaryToRemove: string): void => {
     // second/subsequent time filtering out a binary i.e. a binary has already been hidden
     // and we want to hide more binaries, we simply remove the binary from the binaryFrameFilter array in the URL.
@@ -249,187 +221,112 @@ export const IcicleGraphArrow = memo(function IcicleGraphArrow({
     setBinaryFrameFilter(newMappingsList);
   };
 
-  const highlightSimilarStacksName = highlightSimilarStacksPreference ? hoveringName : null;
-  const highlightSimilarStacksSetName = useMemo(() => {
-    return highlightSimilarStacksPreference ? setHoveringName : noop;
-  }, [highlightSimilarStacksPreference]);
-  const highlightSimilarStacksRow = highlightSimilarStacksPreference ? hoveringRow : null;
-  const path = useMemo(() => {
-    return [];
-  }, []);
-
-  // useMemo for the root graph as it otherwise renders the whole graph if the hoveringRow changes.
-  const root = useMemo(() => {
-    if (isIcicleChart) {
-      return (
+  const handleRowClick = (row: number): void => {
+    // Walk down the stack starting at row until we reach the root (row 0).
+    const path: CurrentPathFrame[] = [];
+    let currentRow = row;
+    while (currentRow > 0) {
+      const frame = getCurrentPathFrameData(table, currentRow);
+      path.push(frame);
+      currentRow = table.getChild(FIELD_PARENT)?.get(currentRow) ?? 0;
+    }
+
+    // Reverse the path so that the root is first.
+    path.reverse();
+    setCurPath(path);
+  };
+
+  const depthColumn = table.getChild(FIELD_DEPTH);
+  const maxDepth = depthColumn === null ? 0 : Math.max(...depthColumn.toArray());
+  const height = maxDepth * RowHeight;
+
+  // To find the selected row, we must walk the current path and look at which
+  // children of the current frame matches the path element exactly. Until the
+  // end, the row we find at the end is our selected row.
+  let currentRow = 0;
+  for (const frame of curPath) {
+    let childRows: number[] = Array.from(table.getChild(FIELD_CHILDREN)?.get(currentRow) ?? []);
+    if (childRows.length === 0) {
+      // If there are no children, we can stop here.
+      break;
+    }
+    childRows = childRows.filter(c => isCurrentPathFrameMatch(table, c, frame));
+    if (childRows.length === 0) {
+      // If there are no children that match the current path frame, we can stop here.
+      break;
+    }
+    if (childRows.length > 1) {
+      // If there are multiple children that match the current path frame, we can stop here.
+      // This is a case where the path is ambiguous and we cannot determine a single row.
+      break;
+    }
+    // If there is exactly one child that matches the current path frame, we can continue.
+    currentRow = childRows[0];
+  }
+  const selectedRow = currentRow;
+
+  return (
+    <TooltipProvider
+      table={table}
+      total={total}
+      totalUnfiltered={total + filtered}
+      profileType={profileType}
+      unit={arrow.unit}
+      compareAbsolute={compareAbsolute}
+    >
+      <div className="relative">
+        <ContextMenuWrapper
+          ref={contextMenuRef}
+          menuId={MENU_ID}
+          table={table}
+          total={total}
+          totalUnfiltered={total + filtered}
+          compareAbsolute={compareAbsolute}
+          resetPath={() => setCurPath([])}
+          hideMenu={hideAll}
+          hideBinary={hideBinary}
+          unit={arrow.unit}
+          profileType={profileType}
+        />
+        <MemoizedTooltip contextElement={svg.current} dockedMetainfo={dockedMetainfo} />
         <svg
           className="font-robotoMono"
           width={width}
           height={height}
           preserveAspectRatio="xMinYMid"
           ref={svg}
-          onContextMenu={displayMenu}
         >
-          <g ref={ref}>
-            <g transform={'translate(0, 0)'}>
-              <IcicleChartRootNode
-                table={table}
-                row={0}
-                colors={colorByColors}
-                colorBy={colorByValue}
-                x={0}
-                y={0}
-                totalWidth={width ?? 1}
-                height={RowHeight}
-                setCurPath={setCurPath}
-                curPath={curPath}
-                total={total}
-                xScale={xScale}
-                path={path}
-                level={0}
-                isRoot={true}
-                searchString={(currentSearchString as string) ?? ''}
-                setHoveringRow={setHoveringRow}
-                setHoveringLevel={setHoveringLevel}
-                sortBy={sortBy}
-                darkMode={isDarkMode}
-                compareMode={compareMode}
-                profileType={profileType}
-                isContextMenuOpen={isContextMenuOpen}
-                hoveringName={highlightSimilarStacksName}
-                setHoveringName={highlightSimilarStacksSetName}
-                hoveringRow={highlightSimilarStacksRow}
-                colorForSimilarNodes={colorForSimilarNodes}
-                highlightSimilarStacksPreference={highlightSimilarStacksPreference}
-                profileSource={profileSource}
-              />
-            </g>
-          </g>
-        </svg>
-      );
-    }
-    return (
-      <svg
-        className="font-robotoMono"
-        width={width}
-        height={height}
-        preserveAspectRatio="xMinYMid"
-        ref={svg}
-        onContextMenu={displayMenu}
-      >
-        <g ref={ref}>
-          <g transform={'translate(0, 0)'}>
+          {Array.from({length: table.numRows}, (_, row) => (
             <IcicleNode
+              key={row}
               table={table}
-              row={0} // root is always row 0 in the arrow record
+              row={row} // root is always row 0 in the arrow record
               colors={colorByColors}
               colorBy={colorByValue}
-              x={0}
-              y={0}
               totalWidth={width ?? 1}
               height={RowHeight}
-              setCurPath={setCurPath}
-              curPath={curPath}
-              total={total}
-              xScale={xScale}
-              path={path}
-              level={0}
-              isRoot={true}
               searchString={(currentSearchString as string) ?? ''}
-              setHoveringRow={setHoveringRow}
-              setHoveringLevel={setHoveringLevel}
-              sortBy={sortBy}
               darkMode={isDarkMode}
               compareMode={compareMode}
-              profileType={profileType}
-              isContextMenuOpen={isContextMenuOpen}
-              hoveringName={highlightSimilarStacksName}
-              setHoveringName={highlightSimilarStacksSetName}
-              hoveringRow={highlightSimilarStacksRow}
               colorForSimilarNodes={colorForSimilarNodes}
-              highlightSimilarStacksPreference={highlightSimilarStacksPreference}
+              selectedRow={selectedRow}
+              onClick={() => {
+                if (isIcicleChart) {
+                  // We don't want to expand in icicle charts.
+                  return;
+                }
+                handleRowClick(row);
+              }}
+              onContextMenu={displayMenu}
+              hoveringRow={highlightSimilarStacksPreference ? hoveringRow : undefined}
+              setHoveringRow={highlightSimilarStacksPreference ? setHoveringRow : noop}
+              isIcicleChart={isIcicleChart}
+              profileSource={profileSource}
             />
-          </g>
-        </g>
-      </svg>
-    );
-  }, [
-    width,
-    height,
-    displayMenu,
-    table,
-    colorByColors,
-    colorByValue,
-    setCurPath,
-    curPath,
-    total,
-    xScale,
-    currentSearchString,
-    sortBy,
-    isDarkMode,
-    compareMode,
-    profileType,
-    isContextMenuOpen,
-    highlightSimilarStacksName,
-    highlightSimilarStacksRow,
-    colorForSimilarNodes,
-    highlightSimilarStacksPreference,
-    path,
-    highlightSimilarStacksSetName,
-    isIcicleChart,
-    profileSource,
-  ]);
-
-  return (
-    <>
-      <div className="relative" onMouseLeave={() => dispatch(setHoveringNode(undefined))}>
-        <ContextMenu
-          menuId={MENU_ID}
-          table={table}
-          row={hoveringRow ?? 0}
-          level={hoveringLevel ?? 0}
-          total={total}
-          totalUnfiltered={total + filtered}
-          profileType={profileType}
-          compareAbsolute={compareAbsolute}
-          trackVisibility={trackVisibility}
-          curPath={curPath}
-          setCurPath={setCurPath}
-          hideMenu={hideAll}
-          hideBinary={hideBinary}
-          unit={arrow.unit}
-        />
-        {dockedMetainfo ? (
-          <DockedGraphTooltip
-            table={table}
-            row={hoveringRow}
-            level={hoveringLevel ?? 0}
-            total={total}
-            totalUnfiltered={total + filtered}
-            profileType={profileType}
-            unit={arrow.unit}
-            compareAbsolute={compareAbsolute}
-          />
-        ) : (
-          !isContextMenuOpen && (
-            <GraphTooltipArrow contextElement={svg.current} isContextMenuOpen={isContextMenuOpen}>
-              <GraphTooltipArrowContent
-                table={table}
-                row={hoveringRow}
-                level={hoveringLevel ?? 0}
-                isFixed={false}
-                total={total}
-                totalUnfiltered={total + filtered}
-                profileType={profileType}
-                unit={arrow.unit}
-                compareAbsolute={compareAbsolute}
-              />
-            </GraphTooltipArrow>
-          )
-        )}
-        {root}
+          ))}
+        </svg>
       </div>
-    </>
+    </TooltipProvider>
   );
 });
 

package/src/ProfileIcicleGraph/IcicleGraphArrow/utils.ts

@@ -25,6 +25,7 @@ import {divide, getLastItem, valueFormatter} from '@parca/utilities';
 import {MergedProfileSource, ProfileSource} from '../../ProfileSource';
 import {BigIntDuo, hexifyAddress} from '../../utils';
 import {
+  FIELD_DEPTH,
   FIELD_FUNCTION_NAME,
   FIELD_FUNCTION_START_LINE,
   FIELD_INLINED,
@@ -33,14 +34,10 @@ import {
   FIELD_MAPPING_FILE,
 } from './index';
 
-export function nodeLabel(
-  table: Table<any>,
-  row: number,
-  level: number,
-  showBinaryName: boolean
-): string {
+export function nodeLabel(table: Table<any>, row: number, showBinaryName: boolean): string {
   const labelsOnly: boolean | null = table.getChild(FIELD_LABELS_ONLY)?.get(row);
-  if (level === 1 && labelsOnly !== null && labelsOnly) {
+  const depth: number = table.getChild(FIELD_DEPTH)?.get(row) ?? 0;
+  if (depth === 1 && labelsOnly !== null && labelsOnly) {
     return getLabelSet(table, row);
   }
 
@@ -150,11 +147,7 @@ export interface CurrentPathFrame {
   labels?: string;
 }
 
-export const getCurrentPathFrameData = (
-  table: Table<any>,
-  row: number,
-  level: number
-): CurrentPathFrame => {
+export const getCurrentPathFrameData = (table: Table<any>, row: number): CurrentPathFrame => {
   const functionName: string | null = arrowToString(table.getChild(FIELD_FUNCTION_NAME)?.get(row));
   const systemName: string | null = arrowToString(table.getChild(FIELD_FUNCTION_NAME)?.get(row));
   const fileName: string | null = arrowToString(table.getChild(FIELD_MAPPING_FILE)?.get(row));
@@ -163,8 +156,9 @@ export const getCurrentPathFrameData = (
   const address = hexifyAddress(addressBigInt);
   const inlined: boolean | null = table.getChild(FIELD_INLINED)?.get(row);
   const labelsOnly: boolean | null = table.getChild(FIELD_LABELS_ONLY)?.get(row);
+  const depth = table.getChild(FIELD_DEPTH)?.get(row) ?? 0;
   let labels: undefined | string;
-  if (level === 1 && labelsOnly !== null && labelsOnly) {
+  if (depth === 1 && labelsOnly !== null && labelsOnly) {
     labels = getLabelSet(table, row);
   }
 
@@ -196,10 +190,9 @@ function getLabelSet(table: Table<any>, row: number): string {
 export function isCurrentPathFrameMatch(
   table: Table<any>,
   row: number,
-  level: number,
   b: CurrentPathFrame
 ): boolean {
-  const a = getCurrentPathFrameData(table, row, level);
+  const a = getCurrentPathFrameData(table, row);
   return (
     a.functionName === b.functionName &&
     a.systemName === b.systemName &&

package/src/ProfileIcicleGraph/index.tsx

@@ -16,7 +16,7 @@ import React, {LegacyRef, ReactNode, useEffect, useMemo, useState} from 'react';
 import {AnimatePresence, motion} from 'framer-motion';
 import {useMeasure} from 'react-use';
 
-import {Flamegraph, FlamegraphArrow} from '@parca/client';
+import {FlamegraphArrow} from '@parca/client';
 import {IcicleGraphSkeleton, useParcaContext, useURLState} from '@parca/components';
 import {ProfileType} from '@parca/parser';
 import {capitalizeOnlyFirstLetter, divide} from '@parca/utilities';
@@ -25,7 +25,6 @@ import {MergedProfileSource, ProfileSource} from '../ProfileSource';
 import DiffLegend from '../ProfileView/components/DiffLegend';
 import {useProfileViewContext} from '../ProfileView/context/ProfileViewContext';
 import {TimelineGuide} from '../TimelineGuide';
-import {IcicleGraph} from './IcicleGraph';
 import {FIELD_FUNCTION_NAME, IcicleGraphArrow} from './IcicleGraphArrow';
 import useMappingList from './IcicleGraphArrow/useMappingList';
 import {CurrentPathFrame, boundsFromProfileSource} from './IcicleGraphArrow/utils';
@@ -36,14 +35,11 @@ export type ResizeHandler = (width: number, height: number) => void;
 
 interface ProfileIcicleGraphProps {
   width: number;
-  graph?: Flamegraph;
   arrow?: FlamegraphArrow;
   total: bigint;
   filtered: bigint;
   profileType?: ProfileType;
-  profileSource?: ProfileSource;
-  curPath: string[] | [];
-  setNewCurPath: (path: string[]) => void;
+  profileSource: ProfileSource;
   curPathArrow: CurrentPathFrame[] | [];
   setNewCurPathArrow: (path: CurrentPathFrame[]) => void;
   loading: boolean;
@@ -72,12 +68,9 @@ export const validateIcicleChartQuery = (
 };
 
 const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
-  graph,
   arrow,
   total,
   filtered,
-  curPath,
-  setNewCurPath,
   curPathArrow,
   setNewCurPathArrow,
   profileType,
@@ -96,7 +89,6 @@ const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
 
   const mappingsList = useMappingList(metadataMappingFiles);
 
-  const [storeSortBy = FIELD_FUNCTION_NAME] = useURLState('sort_by');
   const [colorBy, setColorBy] = useURLState('color_by');
 
   // By default, we want delta profiles (CPU) to be relatively compared.
@@ -120,11 +112,11 @@ const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
     isFiltered,
     filteredPercentage,
   ] = useMemo(() => {
-    if (graph === undefined && arrow === undefined) {
+    if (arrow === undefined) {
       return ['0', '0', false, '0', '0', false, '0', '0'];
     }
 
-    const trimmed: bigint = graph?.trimmed ?? arrow?.trimmed ?? 0n;
+    const trimmed: bigint = arrow?.trimmed ?? 0n;
 
     const totalUnfiltered = total + filtered;
     // safeguard against division by zero
@@ -139,10 +131,9 @@ const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
       filtered > 0,
       numberFormatter.format(divide(total * 100n, totalUnfilteredDivisor)),
     ];
-  }, [graph, arrow, filtered, total]);
+  }, [arrow, filtered, total]);
 
-  const loadingState =
-    !loading && (arrow !== undefined || graph !== undefined) && metadataMappingFiles !== undefined;
+  const loadingState = !loading && arrow !== undefined && metadataMappingFiles !== undefined;
 
   // If there is only one mapping file, we want to color by filename by default.
   useEffect(() => {
@@ -218,25 +209,11 @@ const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
       }
     }
 
-    if (graph === undefined && arrow === undefined)
-      return <div className="mx-auto text-center">No data...</div>;
+    if (arrow === undefined) return <div className="mx-auto text-center">No data...</div>;
 
     if (total === 0n && !loading)
       return <div className="mx-auto text-center">Profile has no samples</div>;
 
-    if (graph !== undefined)
-      return (
-        <IcicleGraph
-          width={width}
-          graph={graph}
-          total={total}
-          filtered={filtered}
-          curPath={curPath}
-          setCurPath={setNewCurPath}
-          profileType={profileType}
-        />
-      );
-
     if (arrow !== undefined) {
       return (
         <div className="relative">
@@ -259,8 +236,6 @@ const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
               curPath={curPathArrow}
               setCurPath={setNewCurPathArrow}
               profileType={profileType}
-              sortBy={storeSortBy as string}
-              flamegraphLoading={isLoading}
               isHalfScreen={isHalfScreen}
               mappingsListFromMetadata={mappingsList}
               compareAbsolute={isCompareAbsolute}
@@ -273,18 +248,14 @@ const ProfileIcicleGraph = function ProfileIcicleGraphNonMemo({
     }
   }, [
     isLoading,
-    graph,
     arrow,
     total,
     loading,
     width,
     filtered,
-    curPath,
-    setNewCurPath,
     curPathArrow,
     setNewCurPathArrow,
     profileType,
-    storeSortBy,
     isHalfScreen,
     isDarkMode,
     mappingsList,