diff options
author | Yabin Cui <yabinc@google.com> | 2024-04-09 09:31:24 -0700 |
---|---|---|
committer | Yabin Cui <yabinc@google.com> | 2024-04-09 09:41:23 -0700 |
commit | 1ac7ee8a152d524475f9ac604d04936913795794 (patch) | |
tree | 3e536c5e8996cdca72b65254a2b8b8aa1e6cff66 | |
parent | 0744f4b1eb07920150f5561dfbcb38fb11b5b89c (diff) | |
download | extras-1ac7ee8a152d524475f9ac604d04936913795794.tar.gz |
simpleperf: report_html.py: Format event counts with commas, right-align
Bug: 332807560
Test: run report_html.py manually
Change-Id: Ie59e3ce2fcc86ac0c867bf5e1f514dab13f317f4
-rw-r--r-- | simpleperf/scripts/report_html.js | 30 | ||||
-rwxr-xr-x | simpleperf/scripts/report_html.py | 5 |
2 files changed, 15 insertions, 20 deletions
diff --git a/simpleperf/scripts/report_html.js b/simpleperf/scripts/report_html.js index 94e8ae5c..a3f899dd 100644 --- a/simpleperf/scripts/report_html.js +++ b/simpleperf/scripts/report_html.js @@ -379,10 +379,10 @@ class ChartView { }; if (isClockEvent(this.eventInfo)) { this.getSampleWeight = function (eventCount) { - return (eventCount / 1000000.0).toFixed(3) + ' ms'; + return (eventCount / 1000000.0).toFixed(3).toLocaleString() + ' ms'; }; } else { - this.getSampleWeight = (eventCount) => '' + eventCount; + this.getSampleWeight = (eventCount) => eventCount.toLocaleString(); } } @@ -622,10 +622,10 @@ class SampleTableWeightSelectorView { return (eventCount) => (eventCount * 100.0 / this.eventCount).toFixed(2) + '%'; } if (this.curOption == 'event_count') { - return (eventCount) => '' + eventCount; + return (eventCount) => eventCount.toLocaleString(); } if (this.curOption == 'event_count_in_ms') { - return (eventCount) => (eventCount / 1000000.0).toFixed(3); + return (eventCount) => (eventCount / 1000000.0).toFixed(3).toLocaleString(); } } @@ -706,7 +706,7 @@ class SampleTableView { data: data, responsive: true, columnDefs: [ - { orderSequence: [ 'desc' ], targets: [0, 1, 2] }, + { orderSequence: [ 'desc' ], className: 'textRight', targets: [0, 1, 2] }, ], }); dataTable.column(7).visible(false); @@ -1082,13 +1082,13 @@ class SampleWeightSelectorView { } if (this.curOption == 'event_count') { return function(eventCount, _) { - return '' + eventCount; + return eventCount.toLocaleString(); }; } if (this.curOption == 'event_count_in_ms') { return function(eventCount, _) { let timeInMs = eventCount / 1000000.0; - return timeInMs.toFixed(3) + ' ms'; + return timeInMs.toFixed(3).toLocaleString() + ' ms'; }; } } @@ -1590,12 +1590,9 @@ class SourceCodeView { data.addColumn('string', 'Self'); data.addColumn('string', 'Code'); data.addRows(rows); - for (let i = 0; i < rows.length; ++i) { - data.setProperty(i, 0, 'className', 'colForLine'); - for (let j = 1; j <= 2; ++j) { - data.setProperty(i, j, 'className', 'colForCount'); - } - } + data.setColumnProperty(0, 'className', 'colForLine'); + data.setColumnProperty(1, 'className', 'colForCount'); + data.setColumnProperty(2, 'className', 'colForCount'); this.div.append(getHtml('pre', {text: sourceFile.path})); let wrapperDiv = $('<div>'); wrapperDiv.appendTo(this.div); @@ -1687,11 +1684,8 @@ class DisassemblyView { data.addColumn('string', 'Self'); data.addColumn('string', 'Code'); data.addRows(rows); - for (let i = 0; i < rows.length; ++i) { - for (let j = 0; j < 2; ++j) { - data.setProperty(i, j, 'className', 'colForCount'); - } - } + data.setColumnProperty(0, 'className', 'colForCount'); + data.setColumnProperty(1, 'className', 'colForCount'); let wrapperDiv = $('<div>'); wrapperDiv.appendTo(this.div); let table = new google.visualization.Table(wrapperDiv.get(0)); diff --git a/simpleperf/scripts/report_html.py b/simpleperf/scripts/report_html.py index ba143fd0..6f89bc83 100755 --- a/simpleperf/scripts/report_html.py +++ b/simpleperf/scripts/report_html.py @@ -982,10 +982,11 @@ class ReportGenerator(object): self.hw.open_tag('script').add( "google.charts.load('current', {'packages': ['corechart', 'table']});").close_tag() self.hw.open_tag('style', type='text/css').add(""" - .colForLine { width: 50px; } - .colForCount { width: 100px; } + .colForLine { width: 50px; text-align: right; } + .colForCount { width: 100px; text-align: right; } .tableCell { font-size: 17px; } .boldTableCell { font-weight: bold; font-size: 17px; } + .textRight { text-align: right; } """).close_tag() self.hw.close_tag('head') self.hw.open_tag('body') |