Skip to content
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

Jump to bottom

Various preparations in call tree code for fast inverted tree #4897

Merged
merged 8 commits into from
Jan 23, 2024
Merged

Various preparations in call tree code for fast inverted tree #4897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48ef450
Remove unused rootCount field.
mstange Jan 19, 2024
6f4c71a
Only pass the traced self/total for a single node to the CallTreeSide…
mstange Jan 15, 2024
5400136
Break _getStackSelf into two functions.
mstange Jan 17, 2024
e6a7b6e
Fold CallNodeSummary into CallTreeTimings.
mstange Jan 17, 2024
f8152a7
Feed CallNodeLeafAndSummary into computeCallTreeTimings.
mstange Jan 17, 2024
b13edbb
Use computeCallTreeTimings for traced timing computation.
mstange Jan 17, 2024
cfed73b
Use getSampleIndexToCallNodeIndexForPreviewFilteredThread.
mstange Jan 17, 2024
10074e3
Split out part of CallTree into CallTreeInternal.
mstange Jan 18, 2024
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
10 changes: 6 additions & 4 deletions src/components/flame-graph/Canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import type {
CallTreeSummaryStrategy,
WeightType,
SamplesLikeTable,
TracedTiming,
InnerWindowID,
Page,
} from 'firefox-profiler/types';
Expand All @@ -49,7 +48,10 @@ import type {
ChartCanvasHoverInfo,
} from '../shared/chart/Canvas';

import type { CallTree } from 'firefox-profiler/profile-logic/call-tree';
import type {
CallTree,
CallTreeTimings,
} from 'firefox-profiler/profile-logic/call-tree';

export type OwnProps = {|
+thread: Thread,
Expand All @@ -75,7 +77,7 @@ export type OwnProps = {|
+callTreeSummaryStrategy: CallTreeSummaryStrategy,
+samples: SamplesLikeTable,
+unfilteredSamples: SamplesLikeTable,
+tracedTiming: TracedTiming | null,
+tracedTiming: CallTreeTimings | null,
+displayImplementation: boolean,
+displayStackType: boolean,
|};
Expand Down Expand Up @@ -391,7 +393,7 @@ class FlameGraphCanvasImpl extends React.PureComponent<Props> {
const time = formatCallNodeNumberWithUnit(
'tracing-ms',
false,
tracedTiming.running[callNodeIndex]
tracedTiming.total[callNodeIndex]
);
percentage = `${time} (${percentage})`;
}
Expand Down
8 changes: 5 additions & 3 deletions src/components/flame-graph/FlameGraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,17 @@ import type {
CallTreeSummaryStrategy,
CallNodeInfo,
IndexIntoCallNodeTable,
TracedTiming,
ThreadsKey,
InnerWindowID,
Page,
} from 'firefox-profiler/types';

import type { FlameGraphTiming } from 'firefox-profiler/profile-logic/flame-graph';

import type { CallTree } from 'firefox-profiler/profile-logic/call-tree';
import type {
CallTree,
CallTreeTimings,
} from 'firefox-profiler/profile-logic/call-tree';

import type { ConnectedProps } from 'firefox-profiler/utils/connect';

Expand Down Expand Up @@ -87,7 +89,7 @@ type StateProps = {|
+callTreeSummaryStrategy: CallTreeSummaryStrategy,
+samples: SamplesLikeTable,
+unfilteredSamples: SamplesLikeTable,
+tracedTiming: TracedTiming | null,
+tracedTiming: CallTreeTimings | null,
+displayImplementation: boolean,
+displayStackType: boolean,
|};
Expand Down
19 changes: 10 additions & 9 deletions src/components/sidebar/CallTreeSidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import type {
ThreadsKey,
CategoryList,
IndexIntoCallNodeTable,
TracedTiming,
SelfAndTotal,
Milliseconds,
WeightType,
IndexIntoCategoryList,
Expand Down Expand Up @@ -291,7 +291,7 @@ type StateProps = {|
+timings: TimingsForPath,
+categoryList: CategoryList,
+weightType: WeightType,
+tracedTiming: TracedTiming | null,
+selectedNodeTracedSelfAndTotal: SelfAndTotal | null,
|};

type Props = ConnectedProps<{||}, StateProps, {||}>;
Expand Down Expand Up @@ -352,7 +352,7 @@ class CallTreeSidebarImpl extends React.PureComponent<Props> {
timings,
categoryList,
weightType,
tracedTiming,
selectedNodeTracedSelfAndTotal,
} = this.props;
const {
forPath: { selfTime, totalTime },
Expand Down Expand Up @@ -402,24 +402,24 @@ class CallTreeSidebarImpl extends React.PureComponent<Props> {
<h4 className="sidebar-title3">
<div>Call node details</div>
</h4>
{tracedTiming ? (
{selectedNodeTracedSelfAndTotal ? (
<SidebarDetail
label="Traced running time"
value={formatMilliseconds(
tracedTiming.running[selectedNodeIndex],
selectedNodeTracedSelfAndTotal.total,
3,
1
)}
></SidebarDetail>
) : null}
{tracedTiming ? (
{selectedNodeTracedSelfAndTotal ? (
<SidebarDetail
label="Traced self time"
value={
tracedTiming.self[selectedNodeIndex] === 0
selectedNodeTracedSelfAndTotal.self === 0
? '—'
: formatMilliseconds(
tracedTiming.self[selectedNodeIndex],
selectedNodeTracedSelfAndTotal.self,
3,
1
)
Expand Down Expand Up @@ -507,7 +507,8 @@ export const CallTreeSidebar = explicitConnect<{||}, StateProps, {||}>({
timings: selectedNodeSelectors.getTimingsForSidebar(state),
categoryList: getCategories(state),
weightType: selectedThreadSelectors.getWeightTypeForCallTree(state),
tracedTiming: selectedThreadSelectors.getTracedTiming(state),
selectedNodeTracedSelfAndTotal:
selectedThreadSelectors.getTracedSelfAndTotalForSelectedCallNode(state),
}),
component: CallTreeSidebarImpl,
});
Loading