diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-09-30 21:03:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-30 21:03:00 +0000 |
| commit | 61575af334bf03f270cf3b3b7a79c978159861eb (patch) | |
| tree | 6ece5349c37bedc51b88ed53ebf51725dc20c4fe /catapult | |
| parent | 6c00c34066f5009a88ab5f35e11ea690941867ec (diff) | |
| parent | 66f8a4b216f39cb5471abe546ec621b39581ad1f (diff) | |
| download | chromium-trace-61575af334bf03f270cf3b3b7a79c978159861eb.tar.gz | |
Merge "Fix counter ordering"android-n-mr1-preview-2android-n-mr1-preview-1
Diffstat (limited to 'catapult')
| -rw-r--r-- | catapult/systrace/systrace/systrace_trace_viewer.html | 2 | ||||
| -rw-r--r-- | catapult/tracing/tracing/model/counter.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/catapult/systrace/systrace/systrace_trace_viewer.html b/catapult/systrace/systrace/systrace_trace_viewer.html index 776ec407..176a8e4e 100644 --- a/catapult/systrace/systrace/systrace_trace_viewer.html +++ b/catapult/systrace/systrace/systrace_trace_viewer.html @@ -4813,7 +4813,7 @@ Counter.prototype={__proto__:tr.model.EventContainer.prototype,get parent(){retu return 0;return this.series_[0].length;},get timestamps(){if(this.series_.length===0) return[];return this.series_[0].timestamps;},getSampleStatistics:function(sampleIndices){sampleIndices.sort();var ret=[];this.series_.forEach(function(series){ret.push(series.getStatistics(sampleIndices));});return ret;},shiftTimestampsForward:function(amount){for(var i=0;i<this.series_.length;++i) this.series_[i].shiftTimestampsForward(amount);},updateBounds:function(){this.totals=[];this.maxTotal=0;this.bounds.reset();if(this.series_.length===0) -return;var firstSeries=this.series_[0];var lastSeries=this.series_[this.series_.length-1];this.bounds.addValue(firstSeries.getTimestamp(0));this.bounds.addValue(lastSeries.getTimestamp(lastSeries.length-1));var numSeries=this.numSeries;this.maxTotal=-Infinity;for(var i=0;i<firstSeries.length;++i){var total=0;this.series_.forEach(function(series){total+=series.getSample(i).value;this.totals.push(total);}.bind(this));this.maxTotal=Math.max(total,this.maxTotal);}}};Counter.compare=function(x,y){var tmp=x.parent.compareTo(y);if(tmp!=0) +return;var firstSeries=this.series_[0];var lastSeries=this.series_[this.series_.length-1];this.bounds.addValue(firstSeries.getTimestamp(0));this.bounds.addValue(lastSeries.getTimestamp(lastSeries.length-1));var numSeries=this.numSeries;this.maxTotal=-Infinity;for(var i=0;i<firstSeries.length;++i){var total=0;this.series_.forEach(function(series){total+=series.getSample(i).value;this.totals.push(total);}.bind(this));this.maxTotal=Math.max(total,this.maxTotal);}}};Counter.compare=function(x,y){var tmp=x.parent.compareTo(y.parent);if(tmp!=0) return tmp;var tmp=x.name.localeCompare(y.name);if(tmp==0) return x.tid-y.tid;return tmp;};return{Counter:Counter};});'use strict';tr.exportTo('tr.model',function(){var Slice=tr.model.Slice;function CpuSlice(cat,title,colorId,start,args,opt_duration){Slice.apply(this,arguments);this.threadThatWasRunning=undefined;this.cpu=undefined;} CpuSlice.prototype={__proto__:Slice.prototype,get analysisTypeName(){return'tr.ui.analysis.CpuSlice';},getAssociatedTimeslice:function(){if(!this.threadThatWasRunning) diff --git a/catapult/tracing/tracing/model/counter.html b/catapult/tracing/tracing/model/counter.html index 74c0991c..a648fd4d 100644 --- a/catapult/tracing/tracing/model/counter.html +++ b/catapult/tracing/tracing/model/counter.html @@ -179,7 +179,7 @@ tr.exportTo('tr.model', function() { * Comparison between counters that orders by parent.compareTo, then name. */ Counter.compare = function(x, y) { - var tmp = x.parent.compareTo(y); + var tmp = x.parent.compareTo(y.parent); if (tmp != 0) return tmp; var tmp = x.name.localeCompare(y.name); |