Skip to content

Commit

Permalink
Converted Observatory icdata-view element
Browse files Browse the repository at this point in the history
R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/2271083002 .
  • Loading branch information
B3rn475 committed Aug 24, 2016
1 parent b4cf35c commit 3d415d5
Show file tree
Hide file tree
Showing 23 changed files with 357 additions and 78 deletions.
4 changes: 3 additions & 1 deletion runtime/observatory/lib/elements.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion runtime/observatory/lib/elements.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions runtime/observatory/lib/models.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 1 addition & 0 deletions runtime/observatory/lib/repositories.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
13 changes: 13 additions & 0 deletions runtime/observatory/lib/src/app/page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion runtime/observatory/lib/src/elements/context_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
}
15 changes: 15 additions & 0 deletions runtime/observatory/lib/src/elements/css/shared.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
180 changes: 169 additions & 11 deletions runtime/observatory/lib/src/elements/icdata_view.dart
Original file line number Diff line number Diff line change
@@ -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';

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;

@CustomTag('icdata-view')
class ICDataViewElement extends ObservatoryElement {
@published ICData icData;
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)
]
];
}
}
56 changes: 0 additions & 56 deletions runtime/observatory/lib/src/elements/icdata_view.html

This file was deleted.

2 changes: 1 addition & 1 deletion runtime/observatory/lib/src/elements/object_common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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, '
Expand Down
4 changes: 0 additions & 4 deletions runtime/observatory/lib/src/elements/service_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading

0 comments on commit 3d415d5

Please sign in to comment.