Merge "Update the duration thresholds that are percentage of ttff for slow start reasons."
diff --git a/src/tools/proto_merger/proto_file.cc b/src/tools/proto_merger/proto_file.cc
index 8b28627..653d271 100644
--- a/src/tools/proto_merger/proto_file.cc
+++ b/src/tools/proto_merger/proto_file.cc
@@ -263,10 +263,10 @@
} // namespace
ProtoFile ProtoFileFromDescriptor(
- std::string premable,
+ std::string preamble,
const google::protobuf::FileDescriptor& desc) {
ProtoFile file;
- file.preamble = std::move(premable);
+ file.preamble = std::move(preamble);
for (int i = 0; i < desc.enum_type_count(); ++i) {
file.enums.push_back(EnumFromDescriptor(*desc.enum_type(i)));
}
diff --git a/src/tools/proto_merger/proto_file.h b/src/tools/proto_merger/proto_file.h
index a7056da..985af47 100644
--- a/src/tools/proto_merger/proto_file.h
+++ b/src/tools/proto_merger/proto_file.h
@@ -27,7 +27,7 @@
namespace perfetto {
namespace proto_merger {
-/// Simplified representation of the coomponents of a .proto file.
+// Simplified representation of the components of a .proto file.
struct ProtoFile {
struct Option {
std::string key;
@@ -85,7 +85,7 @@
};
// Creates a ProtoFile struct from a libprotobuf-full descriptor clas.
-ProtoFile ProtoFileFromDescriptor(std::string premable,
+ProtoFile ProtoFileFromDescriptor(std::string preamble,
const google::protobuf::FileDescriptor&);
} // namespace proto_merger
diff --git a/src/tools/proto_merger/proto_merger.cc b/src/tools/proto_merger/proto_merger.cc
index 65e20d8..6bd30ce 100644
--- a/src/tools/proto_merger/proto_merger.cc
+++ b/src/tools/proto_merger/proto_merger.cc
@@ -181,7 +181,7 @@
input.packageless_type.c_str(), upstream.packageless_type.c_str());
}
- // If the packageless type mathces, the type should also match.
+ // If the packageless type matches, the type should also match.
PERFETTO_CHECK(input.type == upstream.type);
// Get the comments, label and the name from the source of truth.
@@ -253,8 +253,8 @@
continue;
// If the input value doesn't exist, create a fake "input" that we can pass
- // to the merge functon. This basically has the effect that the upstream
- // item is taken but *not* recrusively; i.e. any fields which are inside the
+ // to the merge function. This basically has the effect that the upstream
+ // item is taken but *not* recursively; i.e. any fields which are inside the
// message/oneof are checked against the allowlist individually. If we just
// took the whole upstream here, we could add fields which were not
// allowlisted.
