Commit 9f454ee1 authored by Camillo Bruni's avatar Camillo Bruni Committed by V8 LUCI CQ

[tools] Skip over group entries in RCS input file

callstats.html creates grouped entries on the fly. Thus we can safely
ignore already added group entries from the input file.

Change-Id: I5a17fc895c4d36bfd7b79fcdb6d4644498998f86
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3890977
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Reviewed-by: 's avatarDominik Inführ <dinfuehr@chromium.org>
Cr-Commit-Position: refs/heads/main@{#83135}
parent 187fba74
...@@ -1966,6 +1966,11 @@ code is governed by a BSD-style license that can be found in the LICENSE file. ...@@ -1966,6 +1966,11 @@ code is governed by a BSD-style license that can be found in the LICENSE file.
}; };
} }
add(entry) { add(entry) {
// Ignore accidentally added Group entries.
if (entry.name.startsWith(GroupedEntry.prefix)) {
console.warn("Skipping accidentally added Group entry:", entry, this);
return;
}
let existingEntry = this.entryDict.get(entry.name); let existingEntry = this.entryDict.get(entry.name);
if (existingEntry !== undefined) { if (existingEntry !== undefined) {
// Duplicate entries happen when multiple runs are combined into a // Duplicate entries happen when multiple runs are combined into a
...@@ -1976,11 +1981,6 @@ code is governed by a BSD-style license that can be found in the LICENSE file. ...@@ -1976,11 +1981,6 @@ code is governed by a BSD-style license that can be found in the LICENSE file.
if (group.addTimeAndCount(entry)) return; if (group.addTimeAndCount(entry)) return;
} }
} else { } else {
// Ignore accidentally added Group entries.
if (entry.name.startsWith(GroupedEntry.prefix)) {
console.warn("Skipping accidentally added Group entry:", entry, this);
return;
}
entry.page = this; entry.page = this;
this.entryDict.set(entry.name, entry); this.entryDict.set(entry.name, entry);
for (let group of this.groups) { for (let group of this.groups) {
...@@ -2054,12 +2054,22 @@ code is governed by a BSD-style license that can be found in the LICENSE file. ...@@ -2054,12 +2054,22 @@ code is governed by a BSD-style license that can be found in the LICENSE file.
// or the new object style. // or the new object style.
if (Array.isArray(data)) { if (Array.isArray(data)) {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
page.add(Entry.fromLegacyJSON(i, data[data.length - i - 1])); const entryData = data[data.length - i - 1];
const metricName = entryData[0];
if (metricName.startsWith(GroupedEntry.prefix)) {
console.warn(`Ignoring input group-entry "${metricName}".`);
continue;
};
page.add(Entry.fromLegacyJSON(i, entryData));
} }
} else { } else {
let position = 0; let position = 0;
for (let metric_name in data) { for (let metricName in data) {
page.add(Entry.fromJSON(position, metric_name, data[metric_name])); if (metricName.startsWith(GroupedEntry.prefix)) {
console.warn(`Ignoring input group-entry "${metricName}".`);
continue;
}
page.add(Entry.fromJSON(position, metricName, data[metricName]));
position++; position++;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment