| Index: runtime/observatory/lib/src/elements/code_view.dart
|
| diff --git a/runtime/observatory/lib/src/elements/code_view.dart b/runtime/observatory/lib/src/elements/code_view.dart
|
| index 037a9aa6161482f9c48d0b096e4f41850dd5b121..4ab070ee188061a0ba5ee84884c1c99a02cb7e34 100644
|
| --- a/runtime/observatory/lib/src/elements/code_view.dart
|
| +++ b/runtime/observatory/lib/src/elements/code_view.dart
|
| @@ -6,12 +6,27 @@ library code_view_element;
|
|
|
| import 'dart:async';
|
| import 'dart:html';
|
| -import 'observatory_element.dart';
|
| -import 'service_ref.dart';
|
| -import 'package:observatory/app.dart';
|
| -import 'package:observatory/service.dart';
|
| import 'package:observatory/cpu_profile.dart';
|
| -import 'package:polymer/polymer.dart';
|
| +import 'package:observatory/service.dart' as S;
|
| +import 'package:observatory/models.dart' as M;
|
| +import 'package:observatory/app.dart'
|
| + show SortedTable, SortedTableColumn, SortedTableRow;
|
| +import 'package:observatory/src/elements/curly_block.dart';
|
| +import 'package:observatory/src/elements/function_ref.dart';
|
| +import 'package:observatory/src/elements/helpers/any_ref.dart';
|
| +import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
|
| +import 'package:observatory/src/elements/helpers/tag.dart';
|
| +import 'package:observatory/src/elements/nav/bar.dart';
|
| +import 'package:observatory/src/elements/nav/class_menu.dart';
|
| +import 'package:observatory/src/elements/nav/isolate_menu.dart';
|
| +import 'package:observatory/src/elements/nav/menu.dart';
|
| +import 'package:observatory/src/elements/nav/notify.dart';
|
| +import 'package:observatory/src/elements/nav/refresh.dart';
|
| +import 'package:observatory/src/elements/nav/top_menu.dart';
|
| +import 'package:observatory/src/elements/nav/vm_menu.dart';
|
| +import 'package:observatory/src/elements/object_common.dart';
|
| +import 'package:observatory/src/elements/objectpool_ref.dart';
|
| +import 'package:observatory/utils.dart';
|
|
|
| class DisassemblyTable extends SortedTable {
|
| DisassemblyTable(columns) : super(columns);
|
| @@ -21,17 +36,83 @@ class InlineTable extends SortedTable {
|
| InlineTable(columns) : super(columns);
|
| }
|
|
|
| -@CustomTag('code-view')
|
| -class CodeViewElement extends ObservatoryElement {
|
| - @observable Code code;
|
| - ProfileCode get profile => code == null ? null : code.profile;
|
| +class CodeViewElement extends HtmlElement implements Renderable {
|
| + static const tag = const Tag<CodeViewElement>('code-view',
|
| + dependencies: const [
|
| + CurlyBlockElement.tag,
|
| + FunctionRefElement.tag,
|
| + NavBarElement.tag,
|
| + NavClassMenuElement.tag,
|
| + NavTopMenuElement.tag,
|
| + NavVMMenuElement.tag,
|
| + NavIsolateMenuElement.tag,
|
| + NavMenuElement.tag,
|
| + NavRefreshElement.tag,
|
| + NavNotifyElement.tag,
|
| + ObjectCommonElement.tag,
|
| + ObjectPoolRefElement.tag,
|
| + ]);
|
| +
|
| + RenderingScheduler<CodeViewElement> _r;
|
| +
|
| + Stream<RenderedEvent<CodeViewElement>> get onRendered => _r.onRendered;
|
| +
|
| + M.VM _vm;
|
| + M.IsolateRef _isolate;
|
| + M.EventRepository _events;
|
| + M.NotificationRepository _notifications;
|
| + M.Code _code;
|
| + M.RetainedSizeRepository _retainedSizes;
|
| + M.ReachableSizeRepository _reachableSizes;
|
| + M.InboundReferencesRepository _references;
|
| + M.RetainingPathRepository _retainingPaths;
|
| + M.InstanceRepository _instances;
|
| DisassemblyTable disassemblyTable;
|
| InlineTable inlineTable;
|
|
|
| static const kDisassemblyColumnIndex = 3;
|
|
|
| +
|
| + M.VMRef get vm => _vm;
|
| + M.IsolateRef get isolate => _isolate;
|
| + M.NotificationRepository get notifications => _notifications;
|
| + M.Code get context => _code;
|
| +
|
| + factory CodeViewElement(M.VM vm, M.IsolateRef isolate, M.Code code,
|
| + M.EventRepository events,
|
| + M.NotificationRepository notifications,
|
| + M.RetainedSizeRepository retainedSizes,
|
| + M.ReachableSizeRepository reachableSizes,
|
| + M.InboundReferencesRepository references,
|
| + M.RetainingPathRepository retainingPaths,
|
| + M.InstanceRepository instances,
|
| + {RenderingQueue queue}) {
|
| + assert(vm != null);
|
| + assert(isolate != null);
|
| + assert(events != null);
|
| + assert(notifications != null);
|
| + assert(code != null);
|
| + assert(instances != null);
|
| + assert(retainedSizes != null);
|
| + assert(reachableSizes != null);
|
| + assert(references != null);
|
| + assert(retainingPaths != null);
|
| + CodeViewElement e = document.createElement(tag.name);
|
| + e._r = new RenderingScheduler(e, queue: queue);
|
| + e._vm = vm;
|
| + e._isolate = isolate;
|
| + e._events = events;
|
| + e._notifications = notifications;
|
| + e._code = code;
|
| + e._instances = instances;
|
| + e._retainedSizes = retainedSizes;
|
| + e._reachableSizes = reachableSizes;
|
| + e._references = references;
|
| + e._retainingPaths = retainingPaths;
|
| + return e;
|
| + }
|
| +
|
| CodeViewElement.created() : super.created() {
|
| - // Create table models.
|
| var columns = [
|
| new SortedTableColumn('Address'),
|
| new SortedTableColumn('Inclusive'),
|
| @@ -50,53 +131,212 @@ class CodeViewElement extends ObservatoryElement {
|
| }
|
|
|
| @override
|
| - void attached() {
|
| + attached() {
|
| super.attached();
|
| + _r.enable();
|
| }
|
|
|
| - void codeChanged(oldValue) {
|
| - if (code == null) {
|
| - return;
|
| - }
|
| - code.load().then((Code c) {
|
| - c.loadScript();
|
| - _updateDisassembly();
|
| - _updateInline();
|
| - });
|
| + @override
|
| + detached() {
|
| + super.detached();
|
| + _r.disable(notify: true);
|
| + children = [];
|
| }
|
|
|
| - Future refresh() {
|
| - return code.reload();
|
| + TableElement _disassemblyTable;
|
| + TableElement _inlineRangeTable;
|
| + Element _disassemblyTableBody;
|
| + Element _inlineRangeTableBody;
|
| +
|
| + void render() {
|
| + if (_inlineRangeTable == null) {
|
| + _inlineRangeTable = new TableElement()..classes = ['table'];
|
| + _inlineRangeTable.createTHead()
|
| + .children = [
|
| + new TableRowElement()
|
| + ..children = [
|
| + document.createElement('th')..classes = ['address']
|
| + ..text = 'Address Range',
|
| + document.createElement('th')..classes = ['tick']
|
| + ..text = 'Inclusive',
|
| + document.createElement('th')..classes = ['tick']
|
| + ..text = 'Exclusive',
|
| + document.createElement('th')
|
| + ..text = 'Functions',
|
| + ]
|
| + ];
|
| + _inlineRangeTableBody = _inlineRangeTable.createTBody();
|
| + _inlineRangeTableBody.classes = ['monospace'];
|
| + }
|
| + if (_disassemblyTable == null) {
|
| + _disassemblyTable = new TableElement()..classes = ['table'];
|
| + _disassemblyTable.createTHead()
|
| + .children = [
|
| + new TableRowElement()
|
| + ..children = [
|
| + document.createElement('th')..classes = ['address']
|
| + ..text = 'Address Range',
|
| + document.createElement('th')..classes = ['tick']
|
| + ..title = 'Ticks with PC on the stack'
|
| + ..text = 'Inclusive',
|
| + document.createElement('th')..classes = ['tick']
|
| + ..title = 'Ticks with PC at top of stack'
|
| + ..text = 'Exclusive',
|
| + document.createElement('th')..classes = ['disassembly']
|
| + ..text = 'Disassembly',
|
| + document.createElement('th')..classes = ['object']
|
| + ..text = 'Object',
|
| + ]
|
| + ];
|
| + _disassemblyTableBody = _disassemblyTable.createTBody();
|
| + _disassemblyTableBody.classes = ['monospace'];
|
| + }
|
| + final inlinedFunctions = _code.inlinedFunctions.toList();
|
| + final S.Code code = _code as S.Code;
|
| + children = [
|
| + new NavBarElement(queue: _r.queue)
|
| + ..children = [
|
| + new NavTopMenuElement(queue: _r.queue),
|
| + new NavVMMenuElement(_vm, _events, queue: _r.queue),
|
| + new NavIsolateMenuElement(_isolate, _events, queue: _r.queue),
|
| + new NavMenuElement(_code.name, last: true, queue: _r.queue),
|
| + new NavRefreshElement(queue: _r.queue)
|
| + ..onRefresh.listen((e) async {
|
| + e.element.disabled = true;
|
| + _refresh();
|
| + }),
|
| + new NavRefreshElement(label: 'refresh ticks', queue: _r.queue)
|
| + ..onRefresh.listen((e) async {
|
| + e.element.disabled = true;
|
| + _refreshTicks();
|
| + }),
|
| + new NavNotifyElement(_notifications, queue: _r.queue)
|
| + ],
|
| + new DivElement()..classes = ['content-centered-big']
|
| + ..children = [
|
| + new HeadingElement.h1()
|
| + ..text = (M.isDartCode(_code.kind) && _code.isOptimized)
|
| + ? 'Optimized code for ${_code.name}'
|
| + : 'Code for ${_code.name}',
|
| + new HRElement(),
|
| + new ObjectCommonElement(_isolate, _code, _retainedSizes,
|
| + _reachableSizes, _references, _retainingPaths,
|
| + _instances, queue: _r.queue),
|
| + new BRElement(),
|
| + new DivElement()..classes = ['memberList']
|
| + ..children = [
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'Kind',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..text = _codeKindToString(_code.kind)
|
| + ],
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = M.isDartCode(_code.kind)
|
| + ? const []
|
| + : [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'Optimized',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..text = _code.isOptimized ? 'Yes' : 'No'
|
| + ],
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'Function',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..children = [
|
| + new FunctionRefElement(_isolate, _code.function,
|
| + queue: _r.queue)
|
| + ]
|
| + ],
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = code.profile == null
|
| + ? const []
|
| + : [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'Inclusive',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..text = '${code.profile.formattedInclusiveTicks}'
|
| + ],
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = code.profile == null
|
| + ? const []
|
| + : [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'Exclusive',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..text = '${code.profile.formattedExclusiveTicks}'
|
| + ],
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'Object pool',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..children = [
|
| + new ObjectPoolRefElement(_isolate, _code.objectPool,
|
| + queue: _r.queue)
|
| + ]
|
| + ],
|
| + new DivElement()..classes = ['memberItem']
|
| + ..children = inlinedFunctions.isNotEmpty
|
| + ? const []
|
| + : [
|
| + new DivElement()..classes = ['memberName']
|
| + ..text = 'inlined functions (${inlinedFunctions.length})',
|
| + new DivElement()..classes = ['memberValue']
|
| + ..children = [
|
| + new CurlyBlockElement(
|
| + expanded: inlinedFunctions.length < 8,
|
| + queue: _r.queue)
|
| + ..children = inlinedFunctions.map((f) =>
|
| + new FunctionRefElement(_isolate, f, queue: _r.queue)
|
| + ).toList()
|
| + ]
|
| + ]
|
| + ],
|
| + new HRElement(),
|
| + _inlineRangeTable,
|
| + new HRElement(),
|
| + _disassemblyTable
|
| + ],
|
| + ];
|
| + _updateDisassembly();
|
| + _updateInline();
|
| }
|
|
|
| - Future refreshTicks() {
|
| - var isolate = code.isolate;
|
| - return isolate.invokeRpc('_getCpuProfile', { 'tags': 'None' })
|
| - .then((ServiceMap response) {
|
| - var cpuProfile = new CpuProfile();
|
| - cpuProfile.load(isolate, response);
|
| - _updateDisassembly();
|
| - _updateInline();
|
| - });
|
| + Future _refresh() async {
|
| + S.Code code = _code as S.Code;
|
| + await code.reload();
|
| + _r.dirty();
|
| }
|
|
|
| - String formattedAddress(CodeInstruction instruction) {
|
| + Future _refreshTicks() async {
|
| + S.Code code = _code as S.Code;
|
| + final isolate = code.isolate;
|
| + S.ServiceMap response = await isolate.invokeRpc('_getCpuProfile',
|
| + { 'tags': 'None' });
|
| + final cpuProfile = new CpuProfile();
|
| + await cpuProfile.load(isolate, response);
|
| + _r.dirty();
|
| + }
|
| +
|
| + String _formattedAddress(S.CodeInstruction instruction) {
|
| if (instruction.address == 0) {
|
| return '';
|
| }
|
| return '0x${instruction.address.toRadixString(16)}';
|
| }
|
|
|
| - String formattedAddressRange(CodeInlineInterval interval) {
|
| + String _formattedAddressRange(S.CodeInlineInterval interval) {
|
| String start = interval.start.toRadixString(16);
|
| String end = interval.end.toRadixString(16);
|
| return '[0x$start, 0x$end)';
|
| }
|
|
|
| - String formattedInclusiveInterval(CodeInlineInterval interval) {
|
| - if (code == null) {
|
| - return '';
|
| - }
|
| + String _formattedInclusiveInterval(S.CodeInlineInterval interval) {
|
| + S.Code code = _code as S.Code;
|
| if (code.profile == null) {
|
| return '';
|
| }
|
| @@ -113,10 +353,8 @@ class CodeViewElement extends ObservatoryElement {
|
| return '$pcent (${intervalTick.inclusiveTicks})';
|
| }
|
|
|
| - String formattedExclusiveInterval(CodeInlineInterval interval) {
|
| - if (code == null) {
|
| - return '';
|
| - }
|
| + String _formattedExclusiveInterval(S.CodeInlineInterval interval) {
|
| + S.Code code = _code as S.Code;
|
| if (code.profile == null) {
|
| return '';
|
| }
|
| @@ -130,10 +368,8 @@ class CodeViewElement extends ObservatoryElement {
|
| }
|
|
|
|
|
| - String formattedInclusive(CodeInstruction instruction) {
|
| - if (code == null) {
|
| - return '';
|
| - }
|
| + String _formattedInclusive(S.CodeInstruction instruction) {
|
| + S.Code code = _code as S.Code;
|
| if (code.profile == null) {
|
| return '';
|
| }
|
| @@ -150,10 +386,8 @@ class CodeViewElement extends ObservatoryElement {
|
| return '$pcent (${tick.inclusiveTicks})';
|
| }
|
|
|
| - String formattedExclusive(CodeInstruction instruction) {
|
| - if (code == null) {
|
| - return '';
|
| - }
|
| + String _formattedExclusive(S.CodeInstruction instruction) {
|
| + S.Code code = _code as S.Code;
|
| if (code.profile == null) {
|
| return '';
|
| }
|
| @@ -167,14 +401,15 @@ class CodeViewElement extends ObservatoryElement {
|
| }
|
|
|
| void _updateDiasssemblyTable() {
|
| + S.Code code = _code as S.Code;
|
| disassemblyTable.clearRows();
|
| if (code == null) {
|
| return;
|
| }
|
| - for (CodeInstruction instruction in code.instructions) {
|
| - var row = [formattedAddress(instruction),
|
| - formattedInclusive(instruction),
|
| - formattedExclusive(instruction),
|
| + for (S.CodeInstruction instruction in code.instructions) {
|
| + var row = [_formattedAddress(instruction),
|
| + _formattedInclusive(instruction),
|
| + _formattedExclusive(instruction),
|
| instruction.human,
|
| instruction.object];
|
| disassemblyTable.addRow(new SortedTableRow(row));
|
| @@ -182,7 +417,7 @@ class CodeViewElement extends ObservatoryElement {
|
| }
|
|
|
| void _addDisassemblyDOMRow() {
|
| - var tableBody = $['disassemblyTableBody'];
|
| + var tableBody = _disassemblyTableBody;
|
| assert(tableBody != null);
|
| var tr = new TableRowElement();
|
|
|
| @@ -209,10 +444,11 @@ class CodeViewElement extends ObservatoryElement {
|
| for (var i = 0; i < n; i++) {
|
| final cell = tr.children[i];
|
| final content = row.values[i];
|
| - if (content is ServiceObject) {
|
| - ServiceRefElement element = new Element.tag('any-service-ref');
|
| - element.ref = content;
|
| - cell.children = [element];
|
| + if (content is S.HeapObject) {
|
| + print(content.runtimeType);
|
| + cell.children = [
|
| + anyRef(_isolate, content, _instances, queue: _r.queue)
|
| + ];
|
| } else if (content != null) {
|
| String text = '$content';
|
| if (i == kDisassemblyColumnIndex) {
|
| @@ -233,7 +469,7 @@ class CodeViewElement extends ObservatoryElement {
|
| }
|
|
|
| void _updateDisassemblyDOMTable() {
|
| - var tableBody = $['disassemblyTableBody'];
|
| + var tableBody = _disassemblyTableBody;
|
| assert(tableBody != null);
|
| // Resize DOM table.
|
| if (tableBody.children.length > disassemblyTable.sortedRows.length) {
|
| @@ -270,20 +506,18 @@ class CodeViewElement extends ObservatoryElement {
|
|
|
| void _updateInlineTable() {
|
| inlineTable.clearRows();
|
| - if (code == null) {
|
| - return;
|
| - }
|
| - for (CodeInlineInterval interval in code.inlineIntervals) {
|
| + S.Code code = _code as S.Code;
|
| + for (S.CodeInlineInterval interval in code.inlineIntervals) {
|
| var row = [interval,
|
| - formattedInclusiveInterval(interval),
|
| - formattedExclusiveInterval(interval),
|
| + _formattedInclusiveInterval(interval),
|
| + _formattedExclusiveInterval(interval),
|
| interval.functions];
|
| inlineTable.addRow(new SortedTableRow(row));
|
| }
|
| }
|
|
|
| void _addInlineDOMRow() {
|
| - var tableBody = shadowRoot.querySelector('#inlineRangeTableBody');
|
| + var tableBody = _inlineRangeTableBody;
|
| assert(tableBody != null);
|
| var tr = new TableRowElement();
|
|
|
| @@ -310,7 +544,7 @@ class CodeViewElement extends ObservatoryElement {
|
| {
|
| var addressRangeCell = tr.children[addressRangeColumn];
|
| var interval = row.values[addressRangeColumn];
|
| - var addressRangeString = formattedAddressRange(interval);
|
| + var addressRangeString = _formattedAddressRange(interval);
|
| var addressRangeElement = new SpanElement();
|
| addressRangeElement.classes.add('monospace');
|
| addressRangeElement.text = addressRangeString;
|
| @@ -326,9 +560,8 @@ class CodeViewElement extends ObservatoryElement {
|
| var functionsCell = tr.children[functionsColumn];
|
| functionsCell.children.clear();
|
| for (var func in functions) {
|
| - var functionRef = new Element.tag('function-ref');
|
| - functionRef.ref = func;
|
| - functionsCell.children.add(functionRef);
|
| + functionsCell.children.add(
|
| + new FunctionRefElement(_isolate, func, queue: _r.queue));
|
| var gap = new SpanElement();
|
| gap.style.minWidth = '1em';
|
| gap.text = ' ';
|
| @@ -337,7 +570,7 @@ class CodeViewElement extends ObservatoryElement {
|
| }
|
|
|
| void _updateInlineDOMTable() {
|
| - var tableBody = shadowRoot.querySelector('#inlineRangeTableBody');
|
| + var tableBody = _inlineRangeTableBody;
|
| // Resize DOM table.
|
| if (tableBody.children.length > inlineTable.sortedRows.length) {
|
| // Shrink the table.
|
| @@ -367,32 +600,14 @@ class CodeViewElement extends ObservatoryElement {
|
| _updateInlineDOMTable();
|
| }
|
|
|
| - Element _findJumpTarget(Element target) {
|
| - var jumpTarget = target.attributes['data-jump-target'];
|
| - if (jumpTarget == '') {
|
| - return null;
|
| - }
|
| - var address = int.parse(jumpTarget);
|
| - var node = shadowRoot.querySelector('#addr-$address');
|
| - if (node == null) {
|
| - return null;
|
| - }
|
| - return node;
|
| - }
|
| -
|
| - void mouseOver(Event e, var detail, Node target) {
|
| - var jt = _findJumpTarget(target);
|
| - if (jt == null) {
|
| - return;
|
| - }
|
| - jt.classes.add('highlight');
|
| - }
|
| -
|
| - void mouseOut(Event e, var detail, Node target) {
|
| - var jt = _findJumpTarget(target);
|
| - if (jt == null) {
|
| - return;
|
| + static String _codeKindToString(M.CodeKind kind) {
|
| + switch (kind) {
|
| + case M.CodeKind.dart: return 'dart';
|
| + case M.CodeKind.native: return 'native';
|
| + case M.CodeKind.stub: return 'stub';
|
| + case M.CodeKind.tag: return 'tag';
|
| + case M.CodeKind.collected: return 'collected';
|
| }
|
| - jt.classes.remove('highlight');
|
| + throw new Exception('Unkown CodeKind ($kind)');
|
| }
|
| }
|
|
|