Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1006)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/bin/vmservice/client/deployed/web/index_devtools.html

Issue 148153007: Add Google Charts to Observatory and use it in allocation profiler (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart ('K') | « runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js ('k') | runtime/bin/vmservice/client/lib/observatory.dart » ('j') | runtime/bin/vmservice/client/lib/src/observatory/chart.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/vmservice/client/deployed/web/index_devtools.html
diff --git a/runtime/bin/vmservice/client/deployed/web/index_devtools.html b/runtime/bin/vmservice/client/deployed/web/index_devtools.html
index 9482bd25eef99131649e99c18e4d7cd37e49e57b..bb3723ca4be069090deb5d5ac071df1cb3771e03 100644
--- a/runtime/bin/vmservice/client/deployed/web/index_devtools.html
+++ b/runtime/bin/vmservice/client/deployed/web/index_devtools.html
@@ -1,10 +1,11 @@
-<!DOCTYPE html><html><head><script src="packages/shadow_dom/shadow_dom.debug.js"></script>
-<script src="packages/custom_element/custom-elements.debug.js"></script>
-<script src="packages/browser/interop.js"></script>
+<!DOCTYPE html><html><head>
+
<title>Dart VM Observatory</title>
<meta charset="utf-8">
<link type="text/css" rel="stylesheet" href="bootstrap_css/css/bootstrap.min.css">
+ <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
<script src="index_devtools.html_bootstrap.dart.js"></script>
@@ -485,45 +486,55 @@
<div>
<button type="button" on-click="{{refreshData}}">Refresh</button>
</div>
- <div>
- <span>New Space </span>
- <span>{{ status(true) }}</span>
+ <div class="row">
+ <div id="newPieChart" class="col-md-4" style="height: 400px">
+ </div>
+ <div id="newStatus" class="col-md-2">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td>Collections</td>
+ <td>{{ formattedCollections(true) }}</td>
+ </tr>
+ <tr>
+ <td>Average Collection Time</td>
+ <td>{{ formattedAverage(true) }}</td>
+ </tr>
+ <tr>
+ <td>Cumulative Collection Time</td>
+ <td>{{ formattedTotalCollectionTime(true) }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="oldPieChart" class="col-md-4" style="height: 400px">
+ </div>
+ <div id="oldStatus" class="col-md-2">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td>Collections</td>
+ <td>{{ formattedCollections(true) }}</td>
+ </tr>
+ <tr>
+ <td>Average Collection Time</td>
+ <td>{{ formattedAverage(true) }}</td>
+ </tr>
+ <tr>
+ <td>Cumulative Collection Time</td>
+ <td>{{ formattedTotalCollectionTime(true) }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
- <div>
- <span>Old Space </span>
- <span>{{ status(false) }}</span>
+ <div class="row">
+ <div id="table" class="col-md-12" style="height: 800px"></div>
</div>
- <table class="table table-hover">
- <thead>
- <tr>
- <th>Class</th>
- <th><button on-click="{{changeSortColumn}}" data-msg="1">Current (new)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="2">Allocated since GC (new)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="3">Total before last GC (new)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="4">Total after last GC (new)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="5">Current (old)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="6">Allocated since GC (old)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="7">Total before last GC (old)</button></th>
- <th><button on-click="{{changeSortColumn}}" data-msg="8">Total after last GC (old)</button></th>
- </tr>
- </thead>
- <tbody>
- <tr template="" repeat="{{ cls in sortedProfile }}">
- <td><class-ref app="{{ app }}" ref="{{ cls['class'] }}"></class-ref></td>
- <td>{{ current(cls, true) }}</td>
- <td>{{ allocated(cls, true) }}</td>
- <td>{{ beforeGC(cls, true) }}</td>
- <td>{{ afterGC(cls, true) }}</td>
- <td>{{ current(cls, false) }}</td>
- <td>{{ allocated(cls, false) }}</td>
- <td>{{ beforeGC(cls, false) }}</td>
- <td>{{ afterGC(cls, false) }}</td>
- </tr>
- </tbody>
- </table>
</template>
-</polymer-element><polymer-element name="script-view" extends="observatory-element">
+</polymer-element>
+<polymer-element name="script-view" extends="observatory-element">
<template>
<div class="row">
<div class="col-md-8 col-md-offset-2">
@@ -713,4 +724,4 @@
</polymer-element>
<observatory-application devtools="true"></observatory-application>
-</body></html>
+</body></html>
« runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart ('K') | « runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js ('k') | runtime/bin/vmservice/client/lib/observatory.dart » ('j') | runtime/bin/vmservice/client/lib/src/observatory/chart.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698