Commit 9c8ebcbb authored by Zeynep Cankara's avatar Zeynep Cankara Committed by Commit Bot

[tools][system-analyzer] Timeline-track filter by time event

This CL adds the functionality to filter log events
falling into the time range specified by the user via
mouse events on timeline tracks. The log event selections
on panels updated based on the selected time range.

Bug: v8:10644

Change-Id: Iaf53896fd5c43cefea6d4c40bab5fcb136494b5f
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2351670
Commit-Queue: Zeynep Cankara <zcankara@google.com>
Reviewed-by: 's avatarCamillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#69375}
parent 833662c7
...@@ -3,48 +3,50 @@ ...@@ -3,48 +3,50 @@
// found in the LICENSE file. // found in the LICENSE file.
class State { class State {
#timeSelection = {start: 0, end: Infinity}; #timeSelection = { start: 0, end: Infinity };
#map; #map;
#ic; #ic;
#selectedMapLogEvents;
#selectedIcLogEvents;
#nofChunks; #nofChunks;
#chunks; #chunks;
#icTimeline; #icTimeline;
#mapTimeline; #mapTimeline;
#minStartTime = Number.POSITIVE_INFINITY; #minStartTime = Number.POSITIVE_INFINITY;
#maxEndTime = Number.NEGATIVE_INFINITY; #maxEndTime = Number.NEGATIVE_INFINITY;
get minStartTime(){ get minStartTime() {
return this.#minStartTime; return this.#minStartTime;
} }
get maxEndTime(){ get maxEndTime() {
return this.#maxEndTime; return this.#maxEndTime;
} }
#updateTimeRange(timeline){ #updateTimeRange(timeline) {
this.#minStartTime = Math.min(this.#minStartTime, timeline.startTime); this.#minStartTime = Math.min(this.#minStartTime, timeline.startTime);
this.#maxEndTime = Math.max(this.#maxEndTime, timeline.endTime); this.#maxEndTime = Math.max(this.#maxEndTime, timeline.endTime);
} }
get mapTimeline(){ get mapTimeline() {
return this.#mapTimeline; return this.#mapTimeline;
} }
set mapTimeline(timeline){ set mapTimeline(timeline) {
this.#updateTimeRange(timeline); this.#updateTimeRange(timeline);
timeline.startTime = this.#minStartTime; timeline.startTime = this.#minStartTime;
timeline.endTime = this.#maxEndTime; timeline.endTime = this.#maxEndTime;
this.#mapTimeline = timeline; this.#mapTimeline = timeline;
} }
set icTimeline(timeline){ set icTimeline(timeline) {
this.#updateTimeRange(timeline); this.#updateTimeRange(timeline);
timeline.startTime = this.#minStartTime; timeline.startTime = this.#minStartTime;
timeline.endTime = this.#maxEndTime; timeline.endTime = this.#maxEndTime;
this.#icTimeline = timeline; this.#icTimeline = timeline;
} }
get icTimeline(){ get icTimeline() {
return this.#icTimeline; return this.#icTimeline;
} }
set chunks(value){ set chunks(value) {
//TODO(zcankara) split up between maps and ics, and every timeline track //TODO(zcankara) split up between maps and ics, and every timeline track
this.#chunks = value; this.#chunks = value;
} }
get chunks(){ get chunks() {
//TODO(zcankara) split up between maps and ics, and every timeline track //TODO(zcankara) split up between maps and ics, and every timeline track
return this.#chunks; return this.#chunks;
} }
...@@ -60,7 +62,7 @@ class State { ...@@ -60,7 +62,7 @@ class State {
} }
set map(value) { set map(value) {
//TODO(zcankara) rename as selectedMapEvents, array of selected events //TODO(zcankara) rename as selectedMapEvents, array of selected events
if(!value) return; if (!value) return;
this.#map = value; this.#map = value;
} }
get ic() { get ic() {
...@@ -69,9 +71,23 @@ class State { ...@@ -69,9 +71,23 @@ class State {
} }
set ic(value) { set ic(value) {
//TODO(zcankara) rename selectedIcEvents, array of selected events //TODO(zcankara) rename selectedIcEvents, array of selected events
if(!value) return; if (!value) return;
this.#ic = value; this.#ic = value;
} }
get selectedMapLogEvents() {
return this.#selectedMapLogEvents;
}
set selectedMapLogEvents(value) {
if (!value) return;
this.#selectedMapLogEvents = value;
}
get selectedIcLogEvents() {
return this.#selectedIcLogEvents;
}
set selectedIcLogEvents(value) {
if (!value) return;
this.#selectedIcLogEvents = value;
}
get timeSelection() { get timeSelection() {
return this.#timeSelection; return this.#timeSelection;
} }
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
// found in the LICENSE file. // found in the LICENSE file.
class SelectionEvent extends CustomEvent { class SelectionEvent extends CustomEvent {
constructor(entries){ constructor(entries) {
super('showentries', {bubbles: true, composed: true}); super('showentries', { bubbles: true, composed: true });
if(!Array.isArray(entries) || entries.length == 0){ if (!Array.isArray(entries) || entries.length == 0) {
throw new Error('No valid entries selected!') throw new Error('No valid entries selected!')
} }
this.entries = entries; this.entries = entries;
...@@ -14,10 +14,19 @@ class SelectionEvent extends CustomEvent { ...@@ -14,10 +14,19 @@ class SelectionEvent extends CustomEvent {
} }
class SelectEvent extends CustomEvent { class SelectEvent extends CustomEvent {
constructor(entry){ constructor(entry) {
super('showentrydetail', {bubbles: true, composed: true}); super('showentrydetail', { bubbles: true, composed: true });
this.entry = entry; this.entry = entry;
} }
} }
export {SelectionEvent, SelectEvent}; class SelectTimeEvent extends CustomEvent {
\ No newline at end of file static name = 'timerangeselect';
constructor(start, end) {
super(SelectTimeEvent.name, { bubbles: true, composed: true });
this.start = start;
this.end = end;
}
}
export { SelectionEvent, SelectEvent, SelectTimeEvent };
This diff is collapsed.
...@@ -6,6 +6,7 @@ import CustomIcProcessor from "./ic-processor.mjs"; ...@@ -6,6 +6,7 @@ import CustomIcProcessor from "./ic-processor.mjs";
import { Entry } from "./ic-processor.mjs"; import { Entry } from "./ic-processor.mjs";
import { State } from "./app-model.mjs"; import { State } from "./app-model.mjs";
import { MapProcessor, V8Map } from "./map-processor.mjs"; import { MapProcessor, V8Map } from "./map-processor.mjs";
import { SelectTimeEvent } from "./events.mjs";
import { $ } from "./helper.mjs"; import { $ } from "./helper.mjs";
import "./ic-panel.mjs"; import "./ic-panel.mjs";
import "./timeline-panel.mjs"; import "./timeline-panel.mjs";
...@@ -38,26 +39,28 @@ class App { ...@@ -38,26 +39,28 @@ class App {
this.handleDataUpload(e) this.handleDataUpload(e)
); );
Object.entries(this.#view).forEach(([_, value]) => { Object.entries(this.#view).forEach(([_, value]) => {
value.addEventListener("showentries", (e) => this.handleShowEntries(e)); value.addEventListener('showentries',
value.addEventListener("showentrydetail", (e) => e => this.handleShowEntries(e));
this.handleShowEntryDetail(e) value.addEventListener('showentrydetail',
); e => this.handleShowEntryDetail(e));
value.addEventListener(SelectTimeEvent.name,
e => this.handleTimeRangeSelect(e));
}); });
this.#view.icPanel.addEventListener("ictimefilter", (e) =>
this.handleICTimeFilter(e)
);
} }
handleShowEntries(e) { handleShowEntries(e) {
if (e.entries[0] instanceof V8Map) { if (e.entries[0] instanceof V8Map) {
this.#view.mapPanel.mapEntries = e.entries; this.showMapEntries(e.entries);
} }
} }
handleTimeRangeSelect(e) {
this.selectTimeRange(e.start, e.end);
}
handleShowEntryDetail(e) { handleShowEntryDetail(e) {
if (e.entry instanceof V8Map) { if (e.entry instanceof V8Map) {
this.selectMapLogEvent(e.entry); this.selectMapLogEvent(e.entry);
} else if (e.entry instanceof Entry) { } else if (e.entry instanceof Entry) {
this.selectICLogEvent(e.entry); this.selectICLogEvent(e.entry);
} else if (typeof e.entry === "string") { } else if (typeof e.entry === 'string') {
this.selectSourcePositionEvent(e.entry); this.selectSourcePositionEvent(e.entry);
} else { } else {
console.log("undefined"); console.log("undefined");
...@@ -67,6 +70,18 @@ class App { ...@@ -67,6 +70,18 @@ class App {
//TODO(zcankara) Handle source position //TODO(zcankara) Handle source position
console.log("Entry containing source position: ", e.entries); console.log("Entry containing source position: ", e.entries);
} }
selectTimeRange(start, end) {
this.#state.timeSelection.start = start;
this.#state.timeSelection.end = end;
this.#state.icTimeline.selectTimeRange(start, end);
this.#state.mapTimeline.selectTimeRange(start, end);
this.#view.mapPanel.selectedMapLogEvents = this.#state.mapTimeline.selection;
this.#view.icPanel.filteredEntries = this.#state.icTimeline.selection;
}
showMapEntries(entries) {
this.#state.selectedMapLogEvents = entries;
this.#view.mapPanel.selectedMapLogEvents = this.#state.selectedMapLogEvents;
}
selectMapLogEvent(entry) { selectMapLogEvent(entry) {
this.#state.map = entry; this.#state.map = entry;
this.#view.mapTrack.selectedEntry = entry; this.#view.mapTrack.selectedEntry = entry;
...@@ -78,15 +93,6 @@ class App { ...@@ -78,15 +93,6 @@ class App {
selectSourcePositionEvent(sourcePositions) { selectSourcePositionEvent(sourcePositions) {
console.log("source positions: ", sourcePositions); console.log("source positions: ", sourcePositions);
} }
handleICTimeFilter(event) {
this.#state.timeSelection.start = event.detail.startTime;
this.#state.timeSelection.end = event.detail.endTime;
this.#view.icTrack.data.selectTimeRange(
this.#state.timeSelection.start,
this.#state.timeSelection.end
);
this.#view.icPanel.filteredEntries = this.#view.icTrack.data.selection;
}
handleFileUpload(e) { handleFileUpload(e) {
$("#container").className = "initial"; $("#container").className = "initial";
} }
......
...@@ -4,88 +4,88 @@ ...@@ -4,88 +4,88 @@
import "./stats-panel.mjs"; import "./stats-panel.mjs";
import "./map-panel/map-details.mjs"; import "./map-panel/map-details.mjs";
import "./map-panel/map-transitions.mjs"; import "./map-panel/map-transitions.mjs";
import {SelectEvent} from './events.mjs'; import { SelectEvent } from './events.mjs';
import {V8Map} from "./map-processor.mjs"; import { V8Map } from "./map-processor.mjs";
import {defineCustomElement, V8CustomElement} from './helper.mjs'; import { defineCustomElement, V8CustomElement } from './helper.mjs';
defineCustomElement('map-panel', (templateText) => defineCustomElement('map-panel', (templateText) =>
class MapPanel extends V8CustomElement { class MapPanel extends V8CustomElement {
#map; #map;
constructor() { constructor() {
super(templateText); super(templateText);
this.searchBarBtn.addEventListener( this.searchBarBtn.addEventListener(
'click', e => this.handleSearchBar(e)); 'click', e => this.handleSearchBar(e));
this.addEventListener( this.addEventListener(
'mapdetailsupdate', e => this.handleUpdateMapDetails(e)); 'mapdetailsupdate', e => this.handleUpdateMapDetails(e));
} }
handleUpdateMapDetails(e){ handleUpdateMapDetails(e) {
this.mapDetailsPanel.mapDetails = e.detail; this.mapDetailsPanel.mapDetails = e.detail;
} }
get statsPanel() { get statsPanel() {
return this.$('#stats-panel'); return this.$('#stats-panel');
} }
get mapTransitionsPanel() { get mapTransitionsPanel() {
return this.$('#map-transitions'); return this.$('#map-transitions');
} }
get mapDetailsPanel() { get mapDetailsPanel() {
return this.$('#map-details'); return this.$('#map-details');
} }
get searchBarBtn() { get searchBarBtn() {
return this.$('#searchBarBtn'); return this.$('#searchBarBtn');
} }
get searchBar() { get searchBar() {
return this.$('#searchBar'); return this.$('#searchBar');
} }
get mapDetails() { get mapDetails() {
return this.mapDetailsPanel.mapDetails; return this.mapDetailsPanel.mapDetails;
} }
// send a timeline to the stats-panel // send a timeline to the stats-panel
get timeline() { get timeline() {
return this.statsPanel.timeline; return this.statsPanel.timeline;
} }
set timeline(value) { set timeline(value) {
console.assert(value !== undefined, "timeline undefined!"); console.assert(value !== undefined, "timeline undefined!");
this.statsPanel.timeline = value; this.statsPanel.timeline = value;
this.statsPanel.update(); this.statsPanel.update();
} }
get transitions() { get transitions() {
return this.statsPanel.transitions; return this.statsPanel.transitions;
} }
set transitions(value) { set transitions(value) {
this.statsPanel.transitions = value; this.statsPanel.transitions = value;
} }
set map(value) { set map(value) {
this.#map = value; this.#map = value;
this.mapTransitionsPanel.map = this.#map; this.mapTransitionsPanel.map = this.#map;
} }
handleSearchBar(e){ handleSearchBar(e) {
let searchBar = this.$('#searchBarInput'); let searchBar = this.$('#searchBarInput');
let searchBarInput = searchBar.value; let searchBarInput = searchBar.value;
//access the map from model cache //access the map from model cache
let selectedMap = V8Map.get(searchBarInput); let selectedMap = V8Map.get(searchBarInput);
if(selectedMap){ if (selectedMap) {
searchBar.className = "success"; searchBar.className = "success";
} else { } else {
searchBar.className = "failure"; searchBar.className = "failure";
} }
this.dispatchEvent(new SelectEvent(selectedMap)); this.dispatchEvent(new SelectEvent(selectedMap));
} }
set mapEntries(list){ set selectedMapLogEvents(list) {
this.mapTransitionsPanel.mapEntries = list; this.mapTransitionsPanel.selectedMapLogEvents = list;
} }
get mapEntries(){ get selectedMapLogEvents() {
return this.mapTransitionsPanel.mapEntries; return this.mapTransitionsPanel.selectedMapLogEvents;
} }
}); });
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import {defineCustomElement, V8CustomElement, import {
transitionTypeToColor, CSSColor} from '../helper.mjs'; defineCustomElement, V8CustomElement,
import {kChunkWidth, kChunkHeight} from '../map-processor.mjs'; transitionTypeToColor, CSSColor
import {SelectionEvent, SelectEvent} from '../events.mjs'; } from '../helper.mjs';
import { kChunkWidth, kChunkHeight } from '../map-processor.mjs';
import { SelectionEvent, SelectEvent, SelectTimeEvent } from '../events.mjs';
defineCustomElement('./timeline/timeline-track', (templateText) => defineCustomElement('./timeline/timeline-track', (templateText) =>
class TimelineTrack extends V8CustomElement { class TimelineTrack extends V8CustomElement {
...@@ -13,8 +15,14 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -13,8 +15,14 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
#nofChunks = 400; #nofChunks = 400;
#chunks; #chunks;
#selectedEntry; #selectedEntry;
#timeToPixel;
#timeSelection = { start: 0, end: Infinity };
constructor() { constructor() {
super(templateText); super(templateText);
this.timeline.addEventListener("mousedown",
e => this.handleTimeRangeSelectionStart(e));
this.timeline.addEventListener("mouseup",
e => this.handleTimeRangeSelectionEnd(e));
this.timeline.addEventListener("scroll", this.timeline.addEventListener("scroll",
e => this.handleTimelineScroll(e)); e => this.handleTimelineScroll(e));
this.backgroundCanvas = document.createElement('canvas'); this.backgroundCanvas = document.createElement('canvas');
...@@ -48,36 +56,36 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -48,36 +56,36 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
return this.#timeline; return this.#timeline;
} }
set nofChunks(count){ set nofChunks(count) {
this.#nofChunks = count; this.#nofChunks = count;
this.updateChunks(); this.updateChunks();
this.updateTimeline(); this.updateTimeline();
} }
get nofChunks(){ get nofChunks() {
return this.#nofChunks; return this.#nofChunks;
} }
updateChunks() { updateChunks() {
this.#chunks = this.data.chunks(this.nofChunks); this.#chunks = this.data.chunks(this.nofChunks);
} }
get chunks(){ get chunks() {
return this.#chunks; return this.#chunks;
} }
set selectedEntry(value){ set selectedEntry(value) {
this.#selectedEntry = value; this.#selectedEntry = value;
if(value.edge) this.redraw(); if (value.edge) this.redraw();
} }
get selectedEntry(){ get selectedEntry() {
return this.#selectedEntry; return this.#selectedEntry;
} }
set scrollLeft(offset){ set scrollLeft(offset) {
this.timeline.scrollLeft = offset; this.timeline.scrollLeft = offset;
} }
updateStats(){ updateStats() {
let unique = new Map(); let unique = new Map();
for (const entry of this.data.all) { for (const entry of this.data.all) {
if(!unique.has(entry.type)) { if (!unique.has(entry.type)) {
unique.set(entry.type, [entry]); unique.set(entry.type, [entry]);
} else { } else {
unique.get(entry.type).push(entry); unique.get(entry.type).push(entry);
...@@ -86,7 +94,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -86,7 +94,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
this.renderStatsWindow(unique); this.renderStatsWindow(unique);
} }
renderStatsWindow(unique){ renderStatsWindow(unique) {
let timelineLegendContent = this.timelineLegendContent; let timelineLegendContent = this.timelineLegendContent;
this.removeAllChildren(timelineLegendContent); this.removeAllChildren(timelineLegendContent);
let fragment = document.createDocumentFragment(); let fragment = document.createDocumentFragment();
...@@ -107,7 +115,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -107,7 +115,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
timelineLegendContent.appendChild(fragment); timelineLegendContent.appendChild(fragment);
} }
handleEntryTypeDblClick(e){ handleEntryTypeDblClick(e) {
this.dispatchEvent(new SelectionEvent(e.target.entries)); this.dispatchEvent(new SelectionEvent(e.target.entries));
} }
...@@ -115,11 +123,31 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -115,11 +123,31 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
this.timeline.scrollLeft += offset; this.timeline.scrollLeft += offset;
} }
handleTimelineScroll(e){ handleTimeRangeSelectionStart(e) {
this.#timeSelection.start = this.positionToTime(e.clientX);
}
handleTimeRangeSelectionEnd(e) {
this.#timeSelection.end = this.positionToTime(e.clientX);
this.dispatchEvent(new SelectTimeEvent(
Math.min(this.#timeSelection.start, this.#timeSelection.end),
Math.max(this.#timeSelection.start, this.#timeSelection.end)));
}
positionToTime(posX) {
let rect = this.timeline.getBoundingClientRect();
let posClickedX = posX - rect.left + this.timeline.scrollLeft;
let selectedTime = posClickedX / this.#timeToPixel;
return selectedTime;
}
handleTimelineScroll(e) {
let horizontal = e.currentTarget.scrollLeft; let horizontal = e.currentTarget.scrollLeft;
this.dispatchEvent(new CustomEvent( this.dispatchEvent(new CustomEvent(
'scrolltrack', {bubbles: true, composed: true, 'scrolltrack', {
detail: horizontal})); bubbles: true, composed: true,
detail: horizontal
}));
} }
asyncSetTimelineChunkBackground(backgroundTodo) { asyncSetTimelineChunkBackground(backgroundTodo) {
...@@ -176,11 +204,11 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -176,11 +204,11 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
let start = this.data.startTime; let start = this.data.startTime;
let end = this.data.endTime; let end = this.data.endTime;
let duration = end - start; let duration = end - start;
const timeToPixel = chunks.length * kChunkWidth / duration; this.#timeToPixel = chunks.length * kChunkWidth / duration;
let addTimestamp = (time, name) => { let addTimestamp = (time, name) => {
let timeNode = this.div('timestamp'); let timeNode = this.div('timestamp');
timeNode.innerText = name; timeNode.innerText = name;
timeNode.style.left = ((time - start) * timeToPixel) + 'px'; timeNode.style.left = ((time - start) * this.#timeToPixel) + 'px';
chunksNode.appendChild(timeNode); chunksNode.appendChild(timeNode);
}; };
let backgroundTodo = []; let backgroundTodo = [];
...@@ -224,7 +252,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -224,7 +252,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
if (!chunk) return; if (!chunk) return;
// topmost map (at chunk.height) == map #0. // topmost map (at chunk.height) == map #0.
let relativeIndex = let relativeIndex =
Math.round(event.layerY / event.target.offsetHeight * chunk.size()); Math.round(event.layerY / event.target.offsetHeight * chunk.size());
let map = chunk.at(relativeIndex); let map = chunk.at(relativeIndex);
this.dispatchEvent(new SelectEvent(map)); this.dispatchEvent(new SelectEvent(map));
} }
...@@ -264,7 +292,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -264,7 +292,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
ctx.fill(); ctx.fill();
let imageData = canvas.toDataURL('image/webp', 0.2); let imageData = canvas.toDataURL('image/webp', 0.2);
this.dispatchEvent(new CustomEvent( this.dispatchEvent(new CustomEvent(
'overviewupdate', {bubbles: true, composed: true, detail: imageData})); 'overviewupdate', { bubbles: true, composed: true, detail: imageData }));
} }
redraw() { redraw() {
...@@ -384,7 +412,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) => ...@@ -384,7 +412,7 @@ defineCustomElement('./timeline/timeline-track', (templateText) =>
ctx.textAlign = 'left'; ctx.textAlign = 'left';
ctx.fillStyle = CSSColor.onBackgroundColor; ctx.fillStyle = CSSColor.onBackgroundColor;
ctx.fillText( ctx.fillText(
edge.toString(), centerX + offsetX + 2, centerY - labelOffset); edge.toString(), centerX + offsetX + 2, centerY - labelOffset);
} }
return [xTo, yTo]; return [xTo, yTo];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment