Converted Observatory icdata-view element

R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/2271083002 .
This commit is contained in:
Carlo Bernaschina 2016-08-24 09:33:37 -07:00
parent b4cf35c759
commit 3d415d5ac0
23 changed files with 357 additions and 78 deletions

View file

@ -12,7 +12,6 @@ export 'package:observatory/src/elements/eval_link.dart';
export 'package:observatory/src/elements/field_view.dart';
export 'package:observatory/src/elements/function_view.dart';
export 'package:observatory/src/elements/heap_map.dart';
export 'package:observatory/src/elements/icdata_view.dart';
export 'package:observatory/src/elements/instance_view.dart';
export 'package:observatory/src/elements/isolate_reconnect.dart';
export 'package:observatory/src/elements/isolate_summary.dart';
@ -64,6 +63,7 @@ import 'package:observatory/src/elements/function_ref_wrapper.dart';
import 'package:observatory/src/elements/general_error.dart';
import 'package:observatory/src/elements/heap_snapshot.dart';
import 'package:observatory/src/elements/icdata_ref.dart';
import 'package:observatory/src/elements/icdata_view.dart';
import 'package:observatory/src/elements/instance_ref.dart';
import 'package:observatory/src/elements/instance_ref_wrapper.dart';
import 'package:observatory/src/elements/isolate_reconnect.dart';
@ -137,6 +137,7 @@ export 'package:observatory/src/elements/function_ref.dart';
export 'package:observatory/src/elements/general_error.dart';
export 'package:observatory/src/elements/heap_snapshot.dart';
export 'package:observatory/src/elements/icdata_ref.dart';
export 'package:observatory/src/elements/icdata_view.dart';
export 'package:observatory/src/elements/instance_ref.dart';
export 'package:observatory/src/elements/isolate_reconnect.dart';
export 'package:observatory/src/elements/isolate_ref.dart';
@ -200,6 +201,7 @@ Future initElements() async {
GeneralErrorElement.tag.ensureRegistration();
HeapSnapshotElement.tag.ensureRegistration();
ICDataRefElement.tag.ensureRegistration();
ICDataViewElement.tag.ensureRegistration();
InstanceRefElement.tag.ensureRegistration();
InstanceRefElementWrapper.tag.ensureRegistration();
IsolateCounterChartElement.tag.ensureRegistration();

View file

@ -10,7 +10,6 @@
<link rel="import" href="src/elements/function_view.html">
<link rel="import" href="src/elements/heap_map.html">
<link rel="import" href="src/elements/instance_view.html">
<link rel="import" href="src/elements/icdata_view.html">
<link rel="import" href="src/elements/isolate_summary.html">
<link rel="import" href="src/elements/isolate_view.html">
<link rel="import" href="src/elements/json_view.html">

View file

@ -54,6 +54,7 @@ part 'src/models/repositories/context.dart';
part 'src/models/repositories/event.dart';
part 'src/models/repositories/flag.dart';
part 'src/models/repositories/heap_snapshot.dart';
part 'src/models/repositories/icdata.dart';
part 'src/models/repositories/inbound_references.dart';
part 'src/models/repositories/instance.dart';
part 'src/models/repositories/notification.dart';

View file

@ -21,6 +21,7 @@ part 'src/repositories/context.dart';
part 'src/repositories/event.dart';
part 'src/repositories/flag.dart';
part 'src/repositories/heap_snapshot.dart';
part 'src/repositories/icdata.dart';
part 'src/repositories/inbound_references.dart';
part 'src/repositories/instance.dart';
part 'src/repositories/notification.dart';

View file

@ -9,6 +9,7 @@ AllocationProfileRepository _allocationProfileRepository
ContextRepository _contextRepository = new ContextRepository();
HeapSnapshotRepository _heapSnapshotRepository
= new HeapSnapshotRepository();
ICDataRepository _icdataRepository = new ICDataRepository();
InboundReferencesRepository _inboundReferencesRepository
= new InboundReferencesRepository();
InstanceRepository _instanceRepository = new InstanceRepository();
@ -193,6 +194,18 @@ class InspectPage extends MatchingPage {
_instanceRepository,
queue: app.queue)
];
} else if (obj is ICData) {
container.children = [
new ICDataViewElement(app.vm, obj.isolate, obj, app.events,
app.notifications,
_icdataRepository,
_retainedSizeRepository,
_reachableSizeRepository,
_inboundReferencesRepository,
_retainingPathRepository,
_instanceRepository,
queue: app.queue)
];
} else {
ServiceObjectViewElement serviceElement =new Element.tag('service-view');
serviceElement.object = obj;

View file

@ -19,6 +19,7 @@ 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/view_footer.dart';
class ContextViewElement extends HtmlElement implements Renderable {
static const tag = const Tag<ContextViewElement>('context-view',
@ -33,7 +34,8 @@ class ContextViewElement extends HtmlElement implements Renderable {
NavMenuElement.tag,
NavRefreshElement.tag,
NavNotifyElement.tag,
ObjectCommonElement.tag
ObjectCommonElement.tag,
ViewFooterElement.tag
]);
RenderingScheduler<ContextViewElement> _r;
@ -183,6 +185,8 @@ class ContextViewElement extends HtmlElement implements Renderable {
]
]);
}
content.add(new DivElement()..classes = const ['content-centered-big']
..children = [new ViewFooterElement(queue: _r.queue)]);
children = content;
}
}

View file

@ -850,6 +850,21 @@ heap-snapshot .tree-item > .name {
}
/* icdata-ref */
icdata-ref > a[href]:hover {
text-decoration: underline;
}
icdata-ref > a[href] {
color: #0489c3;
text-decoration: none;
}
icdata-ref > a[href] * {
color: inherit;
}
/* inbound-reference */
inbound-reference > a[href]:hover {

View file

@ -1,21 +1,179 @@
// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
library icdata_view;
import 'dart:async';
import 'observatory_element.dart';
import 'package:observatory/service.dart';
import 'package:polymer/polymer.dart';
import 'dart:html';
import 'package:observatory/models.dart' as M;
import 'package:observatory/src/elements/curly_block.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/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/view_footer.dart';
@CustomTag('icdata-view')
class ICDataViewElement extends ObservatoryElement {
@published ICData icData;
class ICDataViewElement extends HtmlElement implements Renderable {
static const tag = const Tag<ICDataViewElement>('icdata-view',
dependencies: const [
CurlyBlockElement.tag,
NavBarElement.tag,
NavTopMenuElement.tag,
NavVMMenuElement.tag,
NavIsolateMenuElement.tag,
NavMenuElement.tag,
NavRefreshElement.tag,
NavNotifyElement.tag,
ObjectCommonElement.tag,
ViewFooterElement.tag
]);
RenderingScheduler<ICDataViewElement> _r;
Stream<RenderedEvent<ICDataViewElement>> get onRendered => _r.onRendered;
M.VM _vm;
M.IsolateRef _isolate;
M.EventRepository _events;
M.NotificationRepository _notifications;
M.ICData _icdata;
M.ICDataRepository _icdatas;
M.RetainedSizeRepository _retainedSizes;
M.ReachableSizeRepository _reachableSizes;
M.InboundReferencesRepository _references;
M.RetainingPathRepository _retainingPaths;
M.InstanceRepository _instances;
M.VMRef get vm => _vm;
M.IsolateRef get isolate => _isolate;
M.NotificationRepository get notifications => _notifications;
M.ICData get icdata => _icdata;
factory ICDataViewElement(M.VM vm, M.IsolateRef isolate, M.ICData icdata,
M.EventRepository events,
M.NotificationRepository notifications,
M.ICDataRepository icdatas,
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(icdata != null);
assert(icdatas != null);
assert(retainedSizes != null);
assert(reachableSizes != null);
assert(references != null);
assert(retainingPaths != null);
assert(instances != null);
ICDataViewElement 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._icdata = icdata;
e._icdatas = icdatas;
e._retainedSizes = retainedSizes;
e._reachableSizes = reachableSizes;
e._references = references;
e._retainingPaths = retainingPaths;
e._instances = instances;
return e;
}
ICDataViewElement.created() : super.created();
Future refresh() {
return icData.reload();
@override
attached() {
super.attached();
_r.enable();
}
@override
detached() {
super.detached();
_r.disable(notify: true);
children = [];
}
void render() {
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('instance', last: true, queue: _r.queue),
new NavRefreshElement(queue: _r.queue)
..onRefresh.listen((e) async {
e.element.disabled = true;
_icdata = await _icdatas.get(_isolate, _icdata.id);
_r.dirty();
}),
new NavNotifyElement(_notifications, queue: _r.queue)
],
new DivElement()..classes = const ['content-centered-big']
..children = [
new HeadingElement.h2()..text = 'ICData',
new HRElement(),
new ObjectCommonElement(_isolate, _icdata, _retainedSizes,
_reachableSizes, _references, _retainingPaths,
_instances, queue: _r.queue),
new DivElement()..classes = ['memberList']
..children = [
new DivElement()..classes = ['memberItem']
..children = [
new DivElement()..classes = ['memberName']
..text = 'owner',
new DivElement()..classes = ['memberName']
..children = [
_icdata.dartOwner == null
? (new SpanElement()..text = '<none>')
: anyRef(_isolate, _icdata.dartOwner, _instances,
queue: _r.queue)
]
],
new DivElement()..classes = ['memberItem']
..children = [
new DivElement()..classes = ['memberName']
..text = 'argumentsDescriptor',
new DivElement()..classes = ['memberName']
..children = [
_icdata.argumentsDescriptor == null
? (new SpanElement()..text = '<none>')
: anyRef(_isolate, _icdata.argumentsDescriptor,
_instances, queue: _r.queue)
]
],
new DivElement()..classes = ['memberItem']
..children = [
new DivElement()..classes = ['memberName']
..text = 'entries',
new DivElement()..classes = ['memberName']
..children = [
_icdata.entries == null
? (new SpanElement()..text = '<none>')
: anyRef(_isolate, _icdata.entries, _instances,
queue: _r.queue)
]
]
],
new HRElement(),
new ViewFooterElement(queue: _r.queue)
]
];
}
}

View file

@ -1,56 +0,0 @@
<link rel="import" href="../../../../packages/polymer/polymer.html">
<link rel="import" href="error_view.html">
<link rel="import" href="eval_link.html">
<polymer-element name="icdata-view">
<template>
<link rel="stylesheet" href="css/shared.css">
<nav-bar>
<top-nav-menu></top-nav-menu>
<vm-nav-menu vm="{{ icData.isolate.vm }}"></vm-nav-menu>
<isolate-nav-menu isolate="{{ icData.isolate }}"></isolate-nav-menu>
<nav-menu link="." anchor="object" last="{{ true }}"></nav-menu>
<nav-refresh callback="{{ refresh }}"></nav-refresh>
<nav-notify notifications="{{ app.notifications }}"></nav-notify>
</nav-bar>
<div class="content">
<object-common object="{{ icData }}"></object-common>
<br><br>
<div class="memberList">
<div class="memberItem">
<div class="memberName">selector</div>
<div class="memberValue">
{{ icData.selector }}
</div>
</div>
<div class="memberItem">
<div class="memberName">owner</div>
<div class="memberValue">
<any-service-ref ref="{{ icData.dartOwner }}"></any-service-ref>
</div>
</div>
<div class="memberItem">
<div class="memberName">argumentsDescriptor</div>
<div class="memberValue">
<any-service-ref ref="{{ icData.argumentsDescriptor }}"></any-service-ref>
</div>
</div>
<div class="memberItem">
<div class="memberName">entries</div>
<div class="memberValue">
<any-service-ref ref="{{ icData.entries }}"></any-service-ref>
</div>
</div>
</div>
</div>
<hr>
<view-footer></view-footer>
</template>
</polymer-element>
<script type="application/dart" src="icdata_view.dart"></script>

View file

@ -111,7 +111,7 @@ class ObjectCommonElement extends HtmlElement implements Renderable {
new DivElement()..classes = const ['memberName']
..text = 'Shallow size ',
new DivElement()..classes = const ['memberValue']
..text = Utils.formatSize(_object.size)
..text = Utils.formatSize(_object.size ?? 0)
],
new DivElement()..classes = const ['memberItem']
..title = 'Space reachable from this object, '

View file

@ -49,10 +49,6 @@ class ServiceObjectViewElement extends ObservatoryElement {
case 'Object':
return (object) {
switch (object.vmType) {
case 'ICData':
ICDataViewElement element = new Element.tag('icdata-view');
element.icData = object;
return element;
case 'MegamorphicCache':
MegamorphicCacheViewElement element =
new Element.tag('megamorphiccache-view');

View file

@ -7,3 +7,9 @@ part of models;
abstract class ICDataRef extends ObjectRef {
String get selector;
}
abstract class ICData extends Object implements ICDataRef {
ObjectRef get dartOwner;
InstanceRef get argumentsDescriptor;
InstanceRef get entries;
}

View file

@ -0,0 +1,9 @@
// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file
part of models;
abstract class ICDataRepository {
Future<ICData> get(IsolateRef isolate, String id);
}

View file

@ -0,0 +1,15 @@
// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file
part of repositories;
class ICDataRepository extends M.ICDataRepository {
ICDataRepository();
Future<M.ICData> get(M.IsolateRef i, String id) async{
S.Isolate isolate = i as S.Isolate;
assert(isolate != null);
return (await isolate.getObject(id)) as S.ICData;
}
}

View file

@ -3594,8 +3594,8 @@ class ObjectPool extends HeapObject implements M.ObjectPoolRef {
}
}
class ICData extends HeapObject implements M.ICDataRef {
@observable ServiceObject dartOwner;
class ICData extends HeapObject implements M.ICData {
@observable HeapObject dartOwner;
@observable String selector;
@observable Instance argumentsDescriptor;
@observable Instance entries;

View file

@ -88,7 +88,6 @@
'lib/src/elements/helpers/uris.dart',
'lib/src/elements/icdata_ref.dart',
'lib/src/elements/icdata_view.dart',
'lib/src/elements/icdata_view.html',
'lib/src/elements/img/chromium_icon.png',
'lib/src/elements/img/dart_icon.png',
'lib/src/elements/img/isolate_icon.png',
@ -232,6 +231,7 @@
'lib/src/models/repositories/event.dart',
'lib/src/models/repositories/flag.dart',
'lib/src/models/repositories/heap_snapshot.dart',
'lib/src/models/repositories/icdata.dart',
'lib/src/models/repositories/inbound_references.dart',
'lib/src/models/repositories/instance.dart',
'lib/src/models/repositories/notification.dart',
@ -248,6 +248,7 @@
'lib/src/repositories/event.dart',
'lib/src/repositories/flag.dart',
'lib/src/repositories/heap_snapshot.dart',
'lib/src/repositories/icdata.dart',
'lib/src/repositories/inbound_references.dart',
'lib/src/repositories/instance.dart',
'lib/src/repositories/notification.dart',

View file

@ -0,0 +1,58 @@
// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'dart:html';
import 'package:unittest/unittest.dart';
import 'package:observatory/src/elements/icdata_view.dart';
import 'package:observatory/src/elements/nav/refresh.dart';
import 'package:observatory/src/elements/object_common.dart';
import '../mocks.dart';
main() {
ICDataViewElement.tag.ensureRegistration();
final cTag = ObjectCommonElement.tag.name;
final rTag = NavRefreshElement.tag.name;
const vm = const VMMock();
const isolate = const IsolateRefMock();
final events = new EventRepositoryMock();
final notifs = new NotificationRepositoryMock();
final icdata = const ICDataMock();
final icdatas = new ICDataRepositoryMock();
final reachableSizes = new ReachableSizeRepositoryMock();
final retainedSizes = new RetainedSizeRepositoryMock();
final inbounds = new InboundReferencesRepositoryMock();
final paths = new RetainingPathRepositoryMock();
final instances = new InstanceRepositoryMock();
test('instantiation', () {
final e = new ICDataViewElement(vm, isolate, icdata, events, notifs,
icdatas, retainedSizes, reachableSizes,
inbounds, paths, instances);
expect(e, isNotNull, reason: 'element correctly created');
expect(e.isolate, equals(isolate));
expect(e.icdata, equals(icdata));
});
test('elements created after attachment', () async {
final icdatas = new ICDataRepositoryMock(
getter: expectAsync((i, id) async {
expect(i, equals(isolate));
expect(id, equals(icdata.id));
return icdata;
}, count: 1)
);
final e = new ICDataViewElement(vm, isolate, icdata, events, notifs,
icdatas, retainedSizes, reachableSizes,
inbounds, paths, instances);
document.body.append(e);
await e.onRendered.first;
expect(e.children.length, isNonZero, reason: 'has elements');
expect(e.querySelectorAll(cTag).length, equals(1));
(e.querySelector(rTag) as NavRefreshElement).refresh();
await e.onRendered.first;
e.remove();
await e.onRendered.first;
expect(e.children.length, isZero, reason: 'is empty');
});
}

View file

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="dart.unittest" content="full-stack-traces">
<style>
.unittest-table { font-family:monospace; border:1px; }
.unittest-pass { background: #6b3;}
.unittest-fail { background: #d55;}
.unittest-error { background: #a11;}
</style>
<script src="/packages/web_components/webcomponents.js"></script>
<script src="/packages/web_components/dart_support.js"></script>
</head>
<body>
<script type="text/javascript"
src="/root_dart/tools/testing/dart/test_controller.js"></script>
%TEST_SCRIPTS%
</body>
</html>

View file

@ -49,6 +49,7 @@ part 'mocks/repositories/context.dart';
part 'mocks/repositories/event.dart';
part 'mocks/repositories/flag.dart';
part 'mocks/repositories/heap_snapshot.dart';
part 'mocks/repositories/icdata.dart';
part 'mocks/repositories/inbound_references.dart';
part 'mocks/repositories/instance.dart';
part 'mocks/repositories/notification.dart';

View file

@ -10,3 +10,17 @@ class ICDataRefMock implements M.ICDataRef {
const ICDataRefMock({this.id: 'icdata-id', this.selector});
}
class ICDataMock implements M.ICData {
final String id;
final M.ClassRef clazz;
final int size;
final String selector;
final M.ObjectRef dartOwner;
final M.InstanceRef argumentsDescriptor;
final M.InstanceRef entries;
const ICDataMock({this.id: 'icdata-id', this.clazz: const ClassRefMock(),
this.size: 0, this.selector, this.dartOwner,
this.argumentsDescriptor, this.entries});
}

View file

@ -0,0 +1,22 @@
// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
part of mocks;
typedef Future<M.ICData> ICDataRepositoryMockCallback(M.IsolateRef isolate,
String id);
class ICDataRepositoryMock implements M.ICDataRepository {
final ICDataRepositoryMockCallback _get;
ICDataRepositoryMock({ICDataRepositoryMockCallback getter})
: _get = getter;
Future<M.ICData> get(M.IsolateRef isolate, String id, {int count}){
if (_get != null) {
return _get(isolate, id);
}
return new Future.value(null);
}
}