Skip to content
Merged
Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions src/components/stack-chart/Canvas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { withChartViewport, type Viewport } from '../shared/chart/Viewport';
import { ChartCanvas } from '../shared/chart/Canvas';
import { FastFillStyle } from '../../utils';
import TextMeasurement from '../../utils/text-measurement';
import { formatMilliseconds } from '../../utils/format-numbers';
import { formatMilliseconds, formatBytes } from '../../utils/format-numbers';
import { bisectionLeft, bisectionRight } from '../../utils/bisect';
import type {
updatePreviewSelection,
Expand Down Expand Up @@ -36,6 +36,7 @@ import type {
Marker,
InnerWindowID,
Page,
TimelineUnit,
} from 'firefox-profiler/types';
import type { CallNodeInfo } from 'firefox-profiler/profile-logic/call-node-info';

Expand Down Expand Up @@ -77,6 +78,7 @@ type OwnProps = {
readonly marginLeft: CssPixels;
readonly displayStackType: boolean;
readonly useStackChartSameWidths: boolean;
readonly timelineUnit: TimelineUnit;
};

type Props = Readonly<
Expand Down Expand Up @@ -617,6 +619,12 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
const duration =
timing.end[stackTimingIndex] - timing.start[stackTimingIndex];

const { timelineUnit } = this.props;
const durationText =
timelineUnit === 'bytes'
? formatBytes(duration)
: formatMilliseconds(duration);

return (
<TooltipCallNode
thread={thread}
Expand All @@ -628,7 +636,7 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
categories={categories}
// The stack chart doesn't support other call tree summary types.
callTreeSummaryStrategy="timing"
durationText={formatMilliseconds(duration)}
durationText={durationText}
displayStackType={displayStackType}
/>
);
Expand Down
6 changes: 6 additions & 0 deletions src/components/stack-chart/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
getCategories,
getInnerWindowIDToPageMap,
getProfileUsesMultipleStackTypes,
getProfileTimelineUnit,
} from '../../selectors/profile';
import {
getStackChartSameWidths,
Expand Down Expand Up @@ -55,6 +56,7 @@ import type {
ThreadsKey,
InnerWindowID,
Page,
TimelineUnit,
} from 'firefox-profiler/types';
import type { CallNodeInfo } from 'firefox-profiler/profile-logic/call-node-info';

Expand Down Expand Up @@ -84,6 +86,7 @@ type StateProps = {
readonly displayStackType: boolean;
readonly hasFilteredCtssSamples: boolean;
readonly useStackChartSameWidths: boolean;
readonly timelineUnit: TimelineUnit;
};

type DispatchProps = {
Expand Down Expand Up @@ -223,6 +226,7 @@ class StackChartImpl extends React.PureComponent<Props> {
displayStackType,
hasFilteredCtssSamples,
useStackChartSameWidths,
timelineUnit,
} = this.props;

const maxViewportHeight = combinedTimingRows.length * STACK_FRAME_HEIGHT;
Expand Down Expand Up @@ -282,6 +286,7 @@ class StackChartImpl extends React.PureComponent<Props> {
marginLeft: TIMELINE_MARGIN_LEFT,
displayStackType: displayStackType,
useStackChartSameWidths,
timelineUnit,
}}
/>
</div>
Expand Down Expand Up @@ -324,6 +329,7 @@ export const StackChart = explicitConnect<{}, StateProps, DispatchProps>({
hasFilteredCtssSamples:
selectedThreadSelectors.getHasFilteredCtssSamples(state),
useStackChartSameWidths: getStackChartSameWidths(state),
timelineUnit: getProfileTimelineUnit(state),
};
},
mapDispatchToProps: {
Expand Down