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

Side by Side Diff: chrome/browser/resources/gpu_internals/tracing_controller_tests.js

Issue 7495031: trace_event support for thread names (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Handle thread id repeats, fix locking, clarify name lifetime. Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 cr.define('gpu', function() { 4 cr.define('gpu', function() {
5 var dataSets = [ 5 var dataSets = [
6 { 6 {
7 name: "big_trace", 7 name: "big_trace",
8 events_url: "./tests/big_trace.json" 8 events_url: "./tests/big_trace.json"
9 }, 9 },
10 { 10 {
11 name: "trivial_trace",
12 events: [
13 {"name":"a","args":{},"pid":52,"ts":9524,"cat":"foo","tid":53,"ph":"B"},
14 {"name":"a","args":{},"pid":52,"ts":9560,"cat":"foo","tid":53,"ph":"E"},
15 {"name":"b","args":{},"pid":52,"ts":9629,"cat":"foo","tid":53,"ph":"B"},
16 {"name":"b","args":{},"pid":52,"ts":9631,"cat":"foo","tid":53,"ph":"E"}
17 ]
18 },
19 {
11 name: "simple_trace", 20 name: "simple_trace",
12 events: [ 21 events: [
13 {"cat":"PERF","pid":22630,"tid":22630,"ts":826,"ph":"B", 22 {"cat":"PERF","pid":22630,"tid":22630,"ts":826,"ph":"B",
14 "name":"A long name that doesn't fit but is exceedingly informative", 23 "name":"A long name that doesn't fit but is exceedingly informative",
15 "args":{}}, 24 "args":{}},
16 {"cat":"PERF","pid":22630,"tid":22630,"ts":827,"ph":"B", 25 {"cat":"PERF","pid":22630,"tid":22630,"ts":827,"ph":"B",
17 "name":"Asub with a name that won't fit","args":{}}, 26 "name":"Asub with a name that won't fit","args":{}},
18 {"cat":"PERF","pid":22630,"tid":22630,"ts":828,"ph":"E", 27 {"cat":"PERF","pid":22630,"tid":22630,"ts":828,"ph":"E",
19 "name":"Asub","args":{}}, 28 "name":"Asub","args":{}},
20 {"cat":"PERF","pid":22630,"tid":22630,"ts":829,"ph":"B", 29 {"cat":"PERF","pid":22630,"tid":22630,"ts":829,"ph":"B",
(...skipping 18 matching lines...) Expand all
39 {"cat":"PERF","pid":22630,"tid":22630,"ts":854,"ph":"E", 48 {"cat":"PERF","pid":22630,"tid":22630,"ts":854,"ph":"E",
40 "name":"B","args":{}}, 49 "name":"B","args":{}},
41 50
42 {"cat":"PERF","pid":22630,"tid":22631,"ts":827,"ph":"B", 51 {"cat":"PERF","pid":22630,"tid":22631,"ts":827,"ph":"B",
43 "name":"A","args":{}}, 52 "name":"A","args":{}},
44 {"cat":"PERF","pid":22630,"tid":22631,"ts":835,"ph":"I", 53 {"cat":"PERF","pid":22630,"tid":22631,"ts":835,"ph":"I",
45 "name":"Immediate Three","args":{}}, 54 "name":"Immediate Three","args":{}},
46 {"cat":"PERF","pid":22630,"tid":22631,"ts":845,"ph":"I", 55 {"cat":"PERF","pid":22630,"tid":22631,"ts":845,"ph":"I",
47 "name":"I4","args":{}}, 56 "name":"I4","args":{}},
48 {"cat":"PERF","pid":22630,"tid":22631,"ts":854,"ph":"E", 57 {"cat":"PERF","pid":22630,"tid":22631,"ts":854,"ph":"E",
49 "name":"A","args":{}} 58 "name":"A","args":{}},
59
60 {"cat":"__metadata","pid":22630,"tid":22630,"ts":0,"ph":"M",
61 "name":"thread_name","args":{"name": "threadA"}},
62 {"cat":"__metadata","pid":22630,"tid":22631,"ts":0,"ph":"M",
63 "name":"thread_name","args":{"name": "threadB"}},
64 {"cat":"__metadata","pid":22630,"tid":22632,"ts":0,"ph":"M",
65 "name":"thread_name","args":{"name": "threadC"}}
50 ] 66 ]
51 }, 67 },
52 { 68 {
53 name: "nonnested_trace", 69 name: "nonnested_trace",
54 events: [ 70 events: [
55 {'cat':'PERF','pid':22630,'tid':22630,'ts':826,'ph':'B','name':'A','args ':{}}, 71 {'cat':'PERF','pid':22630,'tid':22630,'ts':826,'ph':'B',
56 {'cat':'PERF','pid':22630,'tid':22630,'ts':827,'ph':'B','name':'Asub','a rgs':{}}, 72 'name':'A','args':{}},
73 {'cat':'PERF','pid':22630,'tid':22630,'ts':827,'ph':'B',
74 'name':'Asub','args':{}},
57 {'cat':'PERF','pid':22630,'tid':22630,'ts':829,'ph':'B', 75 {'cat':'PERF','pid':22630,'tid':22630,'ts':829,'ph':'B',
58 'name':'NonNest','args':{'id':'1','ui-nest':'0'}}, 76 'name':'NonNest','args':{'id':'1','ui-nest':'0'}},
59 {'cat':'PERF','pid':22630,'tid':22630,'ts':830,'ph':'B', 77 {'cat':'PERF','pid':22630,'tid':22630,'ts':830,'ph':'B',
60 'name':'NonNest','args':{'id':'2','ui-nest':'0'}}, 78 'name':'NonNest','args':{'id':'2','ui-nest':'0'}},
61 {'cat':'PERF','pid':22630,'tid':22630,'ts':831,'ph':'E', 79 {'cat':'PERF','pid':22630,'tid':22630,'ts':831,'ph':'E',
62 'name':'Asub','args':{}}, 80 'name':'Asub','args':{}},
63 {'cat':'PERF','pid':22630,'tid':22630,'ts':832,'ph':'E', 81 {'cat':'PERF','pid':22630,'tid':22630,'ts':832,'ph':'E',
64 'name':'NonNest','args':{'id':'1','ui-nest':'0'}}, 82 'name':'NonNest','args':{'id':'1','ui-nest':'0'}},
65 {'cat':'PERF','pid':22630,'tid':22630,'ts':833,'ph':'E', 83 {'cat':'PERF','pid':22630,'tid':22630,'ts':833,'ph':'E',
66 'name':'NonNest','args':{'id':'2','ui-nest':'0'}}, 84 'name':'NonNest','args':{'id':'2','ui-nest':'0'}},
67 {'cat':'PERF','pid':22630,'tid':22630,'ts':834,'ph':'E','name':'A','args ':{}}, 85 {'cat':'PERF','pid':22630,'tid':22630,'ts':834,'ph':'E',
86 'name':'A','args':{}},
68 87
69 {'cat':'PERF','pid':22630,'tid':22631,'ts':827,'ph':'B','name':'A','args ':{}}, 88 {'cat':'PERF','pid':22630,'tid':22631,'ts':827,'ph':'B',
70 {'cat':'PERF','pid':22630,'tid':22631,'ts':854,'ph':'E','name':'A','args ':{}} 89 'name':'A','args':{}},
90 {'cat':'PERF','pid':22630,'tid':22631,'ts':854,'ph':'E',
91 'name':'A','args':{}}
71 ] 92 ]
72 }, 93 },
73 { 94 {
74 name: "tall_trace", 95 name: "tall_trace",
75 events: [ 96 events: [
76 {"cat":"PERF","pid":22630,"tid":22630,"ts":826,"ph":"B","name":"A","args ":{}}, 97 {"cat":"X","pid":30,"tid":30,"ts":826,"ph":"B","name":"A","args":{}},
77 {"cat":"PERF","pid":22630,"tid":22630,"ts":827,"ph":"B","name":"Asub","a rgs":{}}, 98 {"cat":"X","pid":30,"tid":30,"ts":827,"ph":"B","name":"Asub","args":{}},
78 {"cat":"PERF","pid":22630,"tid":22630,"ts":828,"ph":"E","name":"Asub","a rgs":{}}, 99 {"cat":"X","pid":30,"tid":30,"ts":828,"ph":"E","name":"Asub","args":{}},
79 {"cat":"PERF","pid":22630,"tid":22630,"ts":829,"ph":"B","name":"Asub","a rgs":{}}, 100 {"cat":"X","pid":30,"tid":30,"ts":829,"ph":"B","name":"Asub","args":{}},
80 {"cat":"PERF","pid":22630,"tid":22630,"ts":832,"ph":"E","name":"Asub","a rgs":{}}, 101 {"cat":"X","pid":30,"tid":30,"ts":832,"ph":"E","name":"Asub","args":{}},
81 {"cat":"PERF","pid":22630,"tid":22630,"ts":833,"ph":"E","name":"","args" :{}}, 102 {"cat":"X","pid":30,"tid":30,"ts":833,"ph":"E","name":"","args":{}},
82 103
83 {"cat":"PERF","pid":22630,"tid":22631,"ts":840,"ph":"B","name":"A","args ":{}}, 104 {"cat":"X","pid":30,"tid":31,"ts":840,"ph":"B","name":"A","args":{}},
84 {"cat":"PERF","pid":22630,"tid":22631,"ts":848,"ph":"E","name":"A","args ":{}}, 105 {"cat":"X","pid":30,"tid":31,"ts":848,"ph":"E","name":"A","args":{}},
85 106
86 {"cat":"PERF","pid":22630,"tid":22632,"ts":840,"ph":"B","name":"A","args ":{}}, 107 {"cat":"X","pid":30,"tid":32,"ts":840,"ph":"B","name":"A","args":{}},
87 {"cat":"PERF","pid":22630,"tid":22632,"ts":848,"ph":"E","name":"A","args ":{}}, 108 {"cat":"X","pid":30,"tid":32,"ts":848,"ph":"E","name":"A","args":{}},
88 109
89 {"cat":"PERF","pid":22630,"tid":22633,"ts":840,"ph":"B","name":"A","args ":{}}, 110 {"cat":"X","pid":30,"tid":33,"ts":840,"ph":"B","name":"A","args":{}},
90 {"cat":"PERF","pid":22630,"tid":22633,"ts":848,"ph":"E","name":"A","args ":{}}, 111 {"cat":"X","pid":30,"tid":33,"ts":848,"ph":"E","name":"A","args":{}},
91 112
92 {"cat":"PERF","pid":22630,"tid":22634,"ts":840,"ph":"B","name":"A","args ":{}}, 113 {"cat":"X","pid":30,"tid":34,"ts":840,"ph":"B","name":"A","args":{}},
93 {"cat":"PERF","pid":22630,"tid":22634,"ts":848,"ph":"E","name":"A","args ":{}}, 114 {"cat":"X","pid":30,"tid":34,"ts":848,"ph":"E","name":"A","args":{}},
94 115
95 {"cat":"PERF","pid":22630,"tid":22635,"ts":840,"ph":"B","name":"A","args ":{}}, 116 {"cat":"X","pid":30,"tid":35,"ts":840,"ph":"B","name":"A","args":{}},
96 {"cat":"PERF","pid":22630,"tid":22635,"ts":848,"ph":"E","name":"A","args ":{}}, 117 {"cat":"X","pid":30,"tid":35,"ts":848,"ph":"E","name":"A","args":{}},
97 118
98 {"cat":"PERF","pid":22630,"tid":22636,"ts":840,"ph":"B","name":"A","args ":{}}, 119 {"cat":"X","pid":30,"tid":36,"ts":840,"ph":"B","name":"A","args":{}},
99 {"cat":"PERF","pid":22630,"tid":22636,"ts":848,"ph":"E","name":"A","args ":{}}, 120 {"cat":"X","pid":30,"tid":36,"ts":848,"ph":"E","name":"A","args":{}},
100 121
101 {"cat":"PERF","pid":22630,"tid":22637,"ts":840,"ph":"B","name":"A","args ":{}}, 122 {"cat":"X","pid":30,"tid":37,"ts":840,"ph":"B","name":"A","args":{}},
102 {"cat":"PERF","pid":22630,"tid":22637,"ts":848,"ph":"E","name":"A","args ":{}}, 123 {"cat":"X","pid":30,"tid":37,"ts":848,"ph":"E","name":"A","args":{}},
103 124
104 {"cat":"PERF","pid":22630,"tid":22638,"ts":840,"ph":"B","name":"A","args ":{}}, 125 {"cat":"X","pid":30,"tid":38,"ts":840,"ph":"B","name":"A","args":{}},
105 {"cat":"PERF","pid":22630,"tid":22638,"ts":848,"ph":"E","name":"A","args ":{}}, 126 {"cat":"X","pid":30,"tid":38,"ts":848,"ph":"E","name":"A","args":{}},
106 127
107 {"cat":"PERF","pid":22630,"tid":22639,"ts":840,"ph":"B","name":"A","args ":{}}, 128 {"cat":"X","pid":30,"tid":39,"ts":840,"ph":"B","name":"A","args":{}},
108 {"cat":"PERF","pid":22630,"tid":22639,"ts":848,"ph":"E","name":"A","args ":{}}, 129 {"cat":"X","pid":30,"tid":39,"ts":848,"ph":"E","name":"A","args":{}},
109 130
110 {"cat":"PERF","pid":22630,"tid":22610,"ts":840,"ph":"B","name":"A","args ":{}}, 131 {"cat":"X","pid":30,"tid":10,"ts":840,"ph":"B","name":"A","args":{}},
111 {"cat":"PERF","pid":22630,"tid":22610,"ts":848,"ph":"E","name":"A","args ":{}}, 132 {"cat":"X","pid":30,"tid":10,"ts":848,"ph":"E","name":"A","args":{}},
112 133
113 {"cat":"PERF","pid":22630,"tid":22611,"ts":840,"ph":"B","name":"A","args ":{}}, 134 {"cat":"X","pid":31,"tid":11,"ts":840,"ph":"B","name":"A","args":{}},
114 {"cat":"PERF","pid":22630,"tid":22611,"ts":848,"ph":"E","name":"A","args ":{}}, 135 {"cat":"X","pid":31,"tid":11,"ts":848,"ph":"E","name":"A","args":{}},
115 136
116 {"cat":"PERF","pid":22630,"tid":22612,"ts":840,"ph":"B","name":"A","args ":{}}, 137 {"cat":"X","pid":30,"tid":12,"ts":840,"ph":"B","name":"A","args":{}},
117 {"cat":"PERF","pid":22630,"tid":22612,"ts":848,"ph":"E","name":"A","args ":{}}, 138 {"cat":"X","pid":30,"tid":12,"ts":848,"ph":"E","name":"A","args":{}},
118 139
119 {"cat":"PERF","pid":22630,"tid":22613,"ts":840,"ph":"B","name":"A","args ":{}}, 140 {"cat":"X","pid":30,"tid":13,"ts":840,"ph":"B","name":"A","args":{}},
120 {"cat":"PERF","pid":22630,"tid":22613,"ts":848,"ph":"E","name":"A","args ":{}}, 141 {"cat":"X","pid":30,"tid":13,"ts":848,"ph":"E","name":"A","args":{}},
121 142
122 {"cat":"PERF","pid":22630,"tid":22614,"ts":840,"ph":"B","name":"A","args ":{}}, 143 {"cat":"X","pid":30,"tid":14,"ts":840,"ph":"B","name":"A","args":{}},
123 {"cat":"PERF","pid":22630,"tid":22614,"ts":848,"ph":"E","name":"A","args ":{}}, 144 {"cat":"X","pid":30,"tid":14,"ts":848,"ph":"E","name":"A","args":{}},
124 145
125 {"cat":"PERF","pid":22630,"tid":22615,"ts":840,"ph":"B","name":"A","args ":{}}, 146 {"cat":"X","pid":30,"tid":15,"ts":840,"ph":"B","name":"A","args":{}},
126 {"cat":"PERF","pid":22630,"tid":22615,"ts":848,"ph":"E","name":"A","args ":{}} 147 {"cat":"X","pid":30,"tid":15,"ts":848,"ph":"E","name":"A","args":{}},
148
149 {"cat":"__metadata","pid":30,"tid":14,"ts":0,"ph":"M",
150 "name":"thread_name","args":{"name": "threadB"}},
151 {"cat":"__metadata","pid":30,"tid":15,"ts":0,"ph":"M",
152 "name":"thread_name","args":{"name": "threadA"}}
127 ] 153 ]
128 }, 154 },
129 { 155 {
130 name: "huge_trace", 156 name: "huge_trace",
131 events_url: "./tests/huge_trace.json" 157 events_url: "./tests/huge_trace.json"
132 } 158 }
133 ]; 159 ];
134 160
135 // Create UI for controlling the test harness 161 // Create UI for controlling the test harness
136 var selectEl = document.createElement("select"); 162 var selectEl = document.createElement("select");
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 }; 218 };
193 req.send(null); 219 req.send(null);
194 } 220 }
195 }, 221 },
196 222
197 endTracing: function() { 223 endTracing: function() {
198 } 224 }
199 } 225 }
200 }; 226 };
201 }); 227 });
OLDNEW
« base/debug/trace_event.cc ('K') | « chrome/browser/resources/gpu_internals/timeline_track.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698