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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/tracing/tracing_controller_tests.js

Issue 8359025: Tons of timeline tweaks (Closed)
Patch Set: Disable eliding due to perf issues Created 9 years, 1 month 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
« chrome/browser/resources/tracing/timeline_model.js ('K') | « chrome/browser/resources/tracing/timeline_view.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/tracing/tracing_controller_tests.js
diff --git a/chrome/browser/resources/tracing/tracing_controller_tests.js b/chrome/browser/resources/tracing/tracing_controller_tests.js
index c57aca15e706e63bcf876d19bb31525fb472c9d6..32a66edc72c1bf66939eaac41aaebbc66f635a40 100644
--- a/chrome/browser/resources/tracing/tracing_controller_tests.js
+++ b/chrome/browser/resources/tracing/tracing_controller_tests.js
@@ -10,151 +10,191 @@ cr.define('tracing', function() {
{
name: 'trivial_trace',
events: [
- {'name':'a','args':{},'pid':52,'ts':9524,'cat':'foo','tid':53,'ph':'B'},
- {'name':'a','args':{},'pid':52,'ts':9560,'cat':'foo','tid':53,'ph':'E'},
- {'name':'b','args':{},'pid':52,'ts':9629,'cat':'foo','tid':53,'ph':'B'},
- {'name':'b','args':{},'pid':52,'ts':9631,'cat':'foo','tid':53,'ph':'E'}
+ {'name': 'a', 'args': {},'pid': 52, 'ts': 9524, 'cat': 'foo', 'tid': 53,
+ 'ph': 'B'},
+ {'name': 'a', 'args': {},'pid': 52, 'ts': 9560, 'cat': 'foo', 'tid': 53,
+ 'ph': 'E'},
+ {'name': 'b', 'args': {},'pid': 52, 'ts': 9629, 'cat': 'foo', 'tid': 53,
+ 'ph': 'B'},
+ {'name': 'b', 'args': {},'pid': 52, 'ts': 9631, 'cat': 'foo', 'tid': 53,
+ 'ph': 'E'}
]
},
{
name: 'simple_trace',
events: [
- {'cat':'PERF','pid':22630,'tid':22630,'ts':826,'ph':'B',
- 'name':'A long name that doesn't fit but is exceedingly informative',
- 'args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':827,'ph':'B',
- 'name':'Asub with a name that won't fit','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':828,'ph':'E',
- 'name':'Asub','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':829,'ph':'B',
- 'name':'Asub','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':832,'ph':'E',
- 'name':'Asub','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':833,'ph':'E',
- 'name':'','args':{}},
-
- {'cat':'PERF','pid':22630,'tid':22630,'ts':835,'ph':'I',
- 'name':'I1','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':837,'ph':'I',
- 'name':'I2','args':{}},
-
- {'cat':'PERF','pid':22630,'tid':22630,'ts':840,'ph':'B',
- 'name':'A not as long a name','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':848,'ph':'E',
- 'name':'A not as long a name','args':{}},
-
- {'cat':'PERF','pid':22630,'tid':22630,'ts':850,'ph':'B',
- 'name':'B','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':854,'ph':'E',
- 'name':'B','args':{}},
-
- {'cat':'PERF','pid':22630,'tid':22631,'ts':827,'ph':'B',
- 'name':'A','args':{}},
- {'cat':'PERF','pid':22630,'tid':22631,'ts':835,'ph':'I',
- 'name':'Immediate Three','args':{}},
- {'cat':'PERF','pid':22630,'tid':22631,'ts':845,'ph':'I',
- 'name':'I4','args':{}},
- {'cat':'PERF','pid':22630,'tid':22631,'ts':854,'ph':'E',
- 'name':'A','args':{}},
-
- {'cat':'__metadata','pid':22630,'tid':22630,'ts':0,'ph':'M',
- 'name':'thread_name','args':{'name': 'threadA'}},
- {'cat':'__metadata','pid':22630,'tid':22631,'ts':0,'ph':'M',
- 'name':'thread_name','args':{'name': 'threadB'}},
- {'cat':'__metadata','pid':22630,'tid':22632,'ts':0,'ph':'M',
- 'name':'thread_name','args':{'name': 'threadC'}}
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 826, 'ph': 'B',
+ 'name': 'A long name that doesnt fit but is exceedingly informative',
+ 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 827, 'ph': 'B',
+ 'name': 'Asub with a name that wont fit', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 828, 'ph': 'E',
+ 'name': 'Asub', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 829, 'ph': 'B',
+ 'name': 'Asub', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 832, 'ph': 'E',
+ 'name': 'Asub', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 833, 'ph': 'E',
+ 'name': '', 'args': {}},
+
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 835, 'ph': 'I',
+ 'name': 'I1', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 837, 'ph': 'I',
+ 'name': 'I2', 'args': {}},
+
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 840, 'ph': 'B',
+ 'name': 'A not as long a name', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 848, 'ph': 'E',
+ 'name': 'A not as long a name', 'args': {}},
+
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 850, 'ph': 'B',
+ 'name': 'B', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 854, 'ph': 'E',
+ 'name': 'B', 'args': {}},
+
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22631, 'ts': 827, 'ph': 'B',
+ 'name': 'A', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22631, 'ts': 835, 'ph': 'I',
+ 'name': 'Immediate Three', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22631, 'ts': 845, 'ph': 'I',
+ 'name': 'I4', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22631, 'ts': 854, 'ph': 'E',
+ 'name': 'A', 'args': {}},
+
+ {'cat': '__metadata', 'pid': 22630, 'tid': 22630, 'ts': 0, 'ph': 'M',
+ 'name': 'thread_name', 'args': {'name': 'threadA'}},
+ {'cat': '__metadata', 'pid': 22630, 'tid': 22631, 'ts': 0, 'ph': 'M',
+ 'name': 'thread_name', 'args': {'name': 'threadB'}},
+ {'cat': '__metadata', 'pid': 22630, 'tid': 22632, 'ts': 0, 'ph': 'M',
+ 'name': 'thread_name', 'args': {'name': 'threadC'}}
]
},
{
name: 'nonnested_trace',
events: [
- {'cat':'PERF','pid':22630,'tid':22630,'ts':826,'ph':'B',
- 'name':'A','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':827,'ph':'B',
- 'name':'Asub','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':829,'ph':'B',
- 'name':'NonNest','args':{'id':'1','ui-nest':'0'}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':830,'ph':'B',
- 'name':'NonNest','args':{'id':'2','ui-nest':'0'}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':831,'ph':'E',
- 'name':'Asub','args':{}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':832,'ph':'E',
- 'name':'NonNest','args':{'id':'1','ui-nest':'0'}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':833,'ph':'E',
- 'name':'NonNest','args':{'id':'2','ui-nest':'0'}},
- {'cat':'PERF','pid':22630,'tid':22630,'ts':834,'ph':'E',
- 'name':'A','args':{}},
-
- {'cat':'PERF','pid':22630,'tid':22631,'ts':827,'ph':'B',
- 'name':'A','args':{}},
- {'cat':'PERF','pid':22630,'tid':22631,'ts':854,'ph':'E',
- 'name':'A','args':{}}
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 826, 'ph': 'B',
+ 'name': 'A', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 827, 'ph': 'B',
+ 'name': 'Asub', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 829, 'ph': 'B',
+ 'name': 'NonNest', 'args': {'id': '1', 'ui-nest': '0'}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 830, 'ph': 'B',
+ 'name': 'NonNest', 'args': {'id': '2', 'ui-nest': '0'}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 831, 'ph': 'E',
+ 'name': 'Asub', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 832, 'ph': 'E',
+ 'name': 'NonNest', 'args': {'id': '1', 'ui-nest': '0'}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 833, 'ph': 'E',
+ 'name': 'NonNest', 'args': {'id': '2', 'ui-nest': '0'}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22630, 'ts': 834, 'ph': 'E',
+ 'name': 'A', 'args': {}},
+
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22631, 'ts': 827, 'ph': 'B',
+ 'name': 'A', 'args': {}},
+ {'cat': 'PERF', 'pid': 22630, 'tid': 22631, 'ts': 854, 'ph': 'E',
+ 'name': 'A', 'args': {}}
]
},
{
name: 'tall_trace',
events: [
- {'cat':'X','pid':30,'tid':30,'ts':826,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':30,'ts':827,'ph':'B','name':'Asub','args':{}},
- {'cat':'X','pid':30,'tid':30,'ts':828,'ph':'E','name':'Asub','args':{}},
- {'cat':'X','pid':30,'tid':30,'ts':829,'ph':'B','name':'Asub','args':{}},
- {'cat':'X','pid':30,'tid':30,'ts':832,'ph':'E','name':'Asub','args':{}},
- {'cat':'X','pid':30,'tid':30,'ts':833,'ph':'E','name':'','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 30, 'ts': 826, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 30, 'ts': 827, 'ph': 'B', 'name': 'Asub',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 30, 'ts': 828, 'ph': 'E', 'name': 'Asub',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 30, 'ts': 829, 'ph': 'B', 'name': 'Asub',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 30, 'ts': 832, 'ph': 'E', 'name': 'Asub',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 30, 'ts': 833, 'ph': 'E', 'name': '',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':31,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':31,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 31, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 31, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':32,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':32,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 32, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 32, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':33,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':33,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 33, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 33, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':34,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':34,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 34, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 34, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':35,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':35,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 35, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 35, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':36,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':36,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 36, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 36, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':37,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':37,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 37, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 37, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':38,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':38,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 38, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 38, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':39,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':39,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 39, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 39, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':10,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':10,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 10, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 10, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':31,'tid':11,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':31,'tid':11,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 31, 'tid': 11, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 31, 'tid': 11, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':12,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':12,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 12, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 12, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':13,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':13,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 13, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 13, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':14,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':14,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 14, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 14, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'X','pid':30,'tid':15,'ts':840,'ph':'B','name':'A','args':{}},
- {'cat':'X','pid':30,'tid':15,'ts':848,'ph':'E','name':'A','args':{}},
+ {'cat': 'X', 'pid': 30, 'tid': 15, 'ts': 840, 'ph': 'B', 'name': 'A',
+ 'args': {}},
+ {'cat': 'X', 'pid': 30, 'tid': 15, 'ts': 848, 'ph': 'E', 'name': 'A',
+ 'args': {}},
- {'cat':'__metadata','pid':30,'tid':14,'ts':0,'ph':'M',
- 'name':'thread_name','args':{'name': 'threadB'}},
- {'cat':'__metadata','pid':30,'tid':15,'ts':0,'ph':'M',
- 'name':'thread_name','args':{'name': 'threadA'}}
+ {'cat': '__metadata', 'pid': 30, 'tid': 14, 'ts': 0, 'ph': 'M',
+ 'name': 'thread_name', 'args': {'name': 'threadB'}},
+ {'cat': '__metadata', 'pid': 30, 'tid': 15, 'ts': 0, 'ph': 'M',
+ 'name': 'thread_name', 'args': {'name': 'threadA'}}
]
},
{
- name: 'huge_trace',
- events_url: './tests/huge_trace.json'
+ name: 'huge_trace',
+ events_url: './tests/huge_trace.json'
}
];
@@ -185,7 +225,7 @@ cr.define('tracing', function() {
document.body.firstChild);
return {
- tracingControllerTestHarness : {
+ tracingControllerTestHarness: {
beginTracing: function() {
var dataSet = dataSets[selectEl.selectedIndex];
if (dataSet.events) {
@@ -199,11 +239,11 @@ cr.define('tracing', function() {
} else {
var req = new XMLHttpRequest();
req.open('GET', './tracing/' + dataSet.events_url, true);
- req.onreadystatechange = function (aEvt) {
+ req.onreadystatechange = function(aEvt) {
if (req.readyState == 4) {
tracingController.endTracing();
window.setTimeout(function() {
- if(req.status == 200) {
+ if (req.status == 200) {
var resp = JSON.parse(req.responseText);
if (resp.traceEvents)
tracingController.onTraceDataCollected(resp.traceEvents);
« chrome/browser/resources/tracing/timeline_model.js ('K') | « chrome/browser/resources/tracing/timeline_view.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698