proto: Fix GpuLog Severity
Proto enums should have prefixes and an "unspecified" value.
This was causing chromium roll issues due to a conflict with an "ERROR"
define.
Change-Id: I7a4f306d6a1867b44c4c8cc071e36868e55697f1
diff --git a/protos/perfetto/trace/gpu/gpu_log.proto b/protos/perfetto/trace/gpu/gpu_log.proto
index 0c37847..7e61139 100644
--- a/protos/perfetto/trace/gpu/gpu_log.proto
+++ b/protos/perfetto/trace/gpu/gpu_log.proto
@@ -22,11 +22,12 @@
// Message for logging events GPU data producer.
message GpuLog {
enum Severity {
- VERBOSE = 0;
- DEBUG = 1;
- INFO = 2;
- WARNING = 3;
- ERROR = 4;
+ SEVERITY_UNSPECIFIED = 0;
+ SEVERITY_VERBOSE = 1;
+ SEVERITY_DEBUG = 2;
+ SEVERITY_INFO = 3;
+ SEVERITY_WARNING = 4;
+ SEVERITY_ERROR = 5;
};
optional Severity severity = 1;
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 8d0e03d..b27257f 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -4149,11 +4149,12 @@
// Message for logging events GPU data producer.
message GpuLog {
enum Severity {
- VERBOSE = 0;
- DEBUG = 1;
- INFO = 2;
- WARNING = 3;
- ERROR = 4;
+ SEVERITY_UNSPECIFIED = 0;
+ SEVERITY_VERBOSE = 1;
+ SEVERITY_DEBUG = 2;
+ SEVERITY_INFO = 3;
+ SEVERITY_WARNING = 4;
+ SEVERITY_ERROR = 5;
};
optional Severity severity = 1;
diff --git a/src/trace_processor/graphics_event_parser.cc b/src/trace_processor/graphics_event_parser.cc
index a8caea5..7265028 100644
--- a/src/trace_processor/graphics_event_parser.cc
+++ b/src/trace_processor/graphics_event_parser.cc
@@ -86,12 +86,14 @@
gpu_log_scope_id_(context_->storage->InternString("gpu_log")),
tag_id_(context_->storage->InternString("tag")),
log_message_id_(context->storage->InternString("message")),
- log_severity_ids_{{context_->storage->InternString("VERBOSE"),
+ log_severity_ids_{{context_->storage->InternString("UNSPECIFIED"),
+ context_->storage->InternString("VERBOSE"),
context_->storage->InternString("DEBUG"),
context_->storage->InternString("INFO"),
context_->storage->InternString("WARNING"),
context_->storage->InternString("ERROR"),
- context_->storage->InternString("UNKNOWN_SEVERITY") /* must be last */}} {}
+ context_->storage->InternString(
+ "UNKNOWN_SEVERITY") /* must be last */}} {}
void GraphicsEventParser::ParseGpuCounterEvent(int64_t ts, ConstBytes blob) {
protos::pbzero::GpuCounterEvent::Decoder event(blob.data, blob.size);
@@ -504,9 +506,9 @@
severity < log_severity_ids_.size()
? log_severity_ids_[static_cast<size_t>(event.severity())]
: log_severity_ids_[log_severity_ids_.size() - 1];
- const auto slice_id = context_->slice_tracker->Scoped(ts, track_id, track_id, RefType::kRefTrack,
- 0 /* cat */, severity_id, 0 /* duration */,
- args_callback);
+ const auto slice_id = context_->slice_tracker->Scoped(
+ ts, track_id, track_id, RefType::kRefTrack, 0 /* cat */, severity_id,
+ 0 /* duration */, args_callback);
tables::GpuSliceTable::Row row;
row.slice_id = slice_id.value();
diff --git a/src/trace_processor/graphics_event_parser.h b/src/trace_processor/graphics_event_parser.h
index fa3f83a..8cac922 100644
--- a/src/trace_processor/graphics_event_parser.h
+++ b/src/trace_processor/graphics_event_parser.h
@@ -76,7 +76,7 @@
const StringId gpu_log_scope_id_;
const StringId tag_id_;
const StringId log_message_id_;
- std::array<StringId, 6> log_severity_ids_;
+ std::array<StringId, 7> log_severity_ids_;
};
} // namespace trace_processor
} // namespace perfetto
diff --git a/test/trace_processor/gpu_log.py b/test/trace_processor/gpu_log.py
index 7720836..b4b0369 100644
--- a/test/trace_processor/gpu_log.py
+++ b/test/trace_processor/gpu_log.py
@@ -18,11 +18,11 @@
import synth_common
trace = synth_common.create_trace()
-trace.add_gpu_log(ts=1, severity=0, tag="tag0", message="message0")
-trace.add_gpu_log(ts=2, severity=1, tag="tag0", message="message1")
-trace.add_gpu_log(ts=3, severity=2, tag="tag0", message="message2")
-trace.add_gpu_log(ts=4, severity=3, tag="tag0", message="message3")
-trace.add_gpu_log(ts=4, severity=4, tag="tag0", message="message4")
-trace.add_gpu_log(ts=5, severity=0, tag="tag1", message="message5")
+trace.add_gpu_log(ts=1, severity=1, tag="tag0", message="message0")
+trace.add_gpu_log(ts=2, severity=2, tag="tag0", message="message1")
+trace.add_gpu_log(ts=3, severity=3, tag="tag0", message="message2")
+trace.add_gpu_log(ts=4, severity=4, tag="tag0", message="message3")
+trace.add_gpu_log(ts=4, severity=5, tag="tag0", message="message4")
+trace.add_gpu_log(ts=5, severity=1, tag="tag1", message="message5")
print(trace.trace.SerializeToString())
