Skip to content

Sort power tracks, and show them right after the other counter tracks. #4470

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
canova merged 1 commit into from
Feb 14, 2023
Merged

Sort power tracks, and show them right after the other counter tracks. #4470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 17 additions & 6 deletions src/profile-logic/tracks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ const LOCAL_TRACK_INDEX_ORDER = {
const LOCAL_TRACK_DISPLAY_ORDER = {
network: 0,
memory: 1,
power: 2,
// IPC tracks that belong to the global track will appear right after network
// and memory tracks. But we want to show the IPC tracks that belong to the
// and counter tracks. But we want to show the IPC tracks that belong to the
// local threads right after their track. This special handling happens inside
// the sort function.
ipc: 2,
thread: 3,
'event-delay': 4,
'process-cpu': 5,
power: 6,
ipc: 3,
thread: 4,
'event-delay': 5,
'process-cpu': 6,
};

const GLOBAL_TRACK_INDEX_ORDER = {
Expand Down Expand Up @@ -113,6 +113,17 @@ function _getDefaultLocalTrackOrder(tracks: LocalTrack[], profile: ?Profile) {
return 1;
}

if (
profile &&
profile.counters &&
tracks[a].type === 'power' &&
tracks[b].type === 'power'
) {
const nameA = profile.counters[tracks[a].counterIndex].name;
const nameB = profile.counters[tracks[b].counterIndex].name;
return naturalSort.compare(nameA, nameB);
}

// If the tracks are both threads, sort them by thread name, and then by
// creation time if they have the same name.
if (tracks[a].type === 'thread' && tracks[b].type === 'thread' && profile) {
Expand Down