Skip to content

ui: Fix AndroidLockContention owner slice navigation #7007

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

Open
ivan-chong wants to merge 1 commit into from
+29 −37
Open

ui: Fix AndroidLockContention owner slice navigation #7007

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
66 changes: 29 additions & 37 deletions ui/src/plugins/com.android.AndroidLockContention/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,48 +58,40 @@ export default class AndroidLockContentionPlugin implements PerfettoPlugin {
const selection = trace.selection.selection;
if (selection.kind !== 'track_event') return;

const currentEventId = selection.eventId;
const currentTrackUri = selection.trackUri;

const query = await trace.engine.query(`
SELECT owner_tid, id FROM __android_lock_contention_owner_events WHERE id = ${selection.eventId} LIMIT 1
`);
if (query.numRows() > 0) {
const row = query.firstRow({owner_tid: NUM, id: NUM});
const targetUri = `com.android.AndroidLockContention#OwnerEvents_${row.owner_tid}`;

if (currentEventId === row.id && currentTrackUri === targetUri) {
return;
if (
selection.trackUri.startsWith(
'com.android.AndroidLockContention#OwnerEvents',
)
) {
if (this.currentBlockedSlice?.trackUri) {
this.selectAndNavigate(
trace,
this.currentBlockedSlice.id,
this.currentBlockedSlice.trackUri,
);
} else {
this.selectAndNavigate(trace, selection.eventId, undefined, true);
}

this.selectAndNavigate(trace, row.id, targetUri);
return;
}

const contentionQuery = await trace.engine.query(`
SELECT owner_tid, ts FROM __android_lock_contention_owner_events WHERE id = ${selection.eventId} LIMIT 1
const query = await trace.engine.query(`
SELECT id, owner_tid
FROM __android_lock_contention_owner_events
WHERE id = ${selection.eventId}
LIMIT 1
`);
if (contentionQuery.numRows() > 0) {
const row = contentionQuery.firstRow({owner_tid: NUM, ts: LONG});

const ownerQuery = await trace.engine.query(`
SELECT id FROM __android_lock_contention_owner_events
WHERE owner_tid = ${row.owner_tid}
AND ts <= ${row.ts}
AND ts + dur >= ${row.ts}
LIMIT 1
`);
if (ownerQuery.numRows() > 0) {
const ownerId = ownerQuery.firstRow({id: NUM}).id;
const targetUri = `com.android.AndroidLockContention#OwnerEvents_${row.owner_tid}`;

if (currentEventId === ownerId && currentTrackUri === targetUri) {
return;
}

this.selectAndNavigate(trace, ownerId, targetUri);
return;
}
if (query.numRows() > 0) {
const row = query.firstRow({id: NUM, owner_tid: NUM});
this.currentBlockedSlice = {
id: selection.eventId,
trackUri: selection.trackUri,
};
this.selectAndNavigate(
trace,
row.id,
`com.android.AndroidLockContention#OwnerEvents_${row.owner_tid}`,
);
}
}
public readonly navigation = new LockContentionNavigation();
Expand Down
Loading