aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuliano Procida <gprocida@google.com>2024-01-19 09:04:41 +0000
committerGiuliano Procida <gprocida@google.com>2024-02-09 12:54:51 +0000
commitf5efa7e7443deeae097f85e3886ed1f461eb0b63 (patch)
tree5ed2da485becb299b3647ac0118dbe8cbc915a47
parentb848ace10cfa7a6b7c18bd5cc25af53cc328e840 (diff)
downloadstg-f5efa7e7443deeae097f85e3886ed1f461eb0b63.tar.gz
make all Time objects const
These values exist only to do useful work in their constructors and destructors. PiperOrigin-RevId: 599756287 Change-Id: Ibef72f4ef0f40e20c9eb50040d6ad68748100c63
-rw-r--r--abigail_reader.cc2
-rw-r--r--deduplication.cc6
-rw-r--r--fingerprint.cc2
-rw-r--r--input.cc8
-rw-r--r--metrics_test.cc2
-rw-r--r--stg.cc2
-rw-r--r--stgdiff.cc6
7 files changed, 14 insertions, 14 deletions
diff --git a/abigail_reader.cc b/abigail_reader.cc
index cdfc1c6..3c8eb42 100644
--- a/abigail_reader.cc
+++ b/abigail_reader.cc
@@ -1290,7 +1290,7 @@ Document Read(const std::string& path, Metrics& metrics) {
// Read the XML.
Document document(nullptr, xmlFreeDoc);
{
- Time t(metrics, "abigail.libxml_parse");
+ const Time t(metrics, "abigail.libxml_parse");
std::unique_ptr<
std::remove_pointer_t<xmlParserCtxtPtr>, void(*)(xmlParserCtxtPtr)>
context(xmlNewParserCtxt(), xmlFreeParserCtxt);
diff --git a/deduplication.cc b/deduplication.cc
index a3b1f9d..1277f3b 100644
--- a/deduplication.cc
+++ b/deduplication.cc
@@ -35,7 +35,7 @@ Id Deduplicate(Graph& graph, Id root, const Hashes& hashes, Metrics& metrics) {
// Partition the nodes by hash.
std::unordered_map<HashValue, std::vector<Id>> partitions;
{
- Time x(metrics, "partition nodes");
+ const Time x(metrics, "partition nodes");
for (const auto& [id, fp] : hashes) {
partitions[fp].push_back(id);
}
@@ -59,7 +59,7 @@ Id Deduplicate(Graph& graph, Id root, const Hashes& hashes, Metrics& metrics) {
Counter equalities(metrics, "deduplicate.equalities");
Counter inequalities(metrics, "deduplicate.inequalities");
{
- Time x(metrics, "find duplicates");
+ const Time x(metrics, "find duplicates");
for (auto& [fp, ids] : partitions) {
while (ids.size() > 1) {
std::vector<Id> todo;
@@ -89,7 +89,7 @@ Id Deduplicate(Graph& graph, Id root, const Hashes& hashes, Metrics& metrics) {
};
Substitute substitute(graph, remap);
{
- Time x(metrics, "rewrite");
+ const Time x(metrics, "rewrite");
for (const auto& [id, fp] : hashes) {
Id fid = cache.Find(id);
if (fid != id) {
diff --git a/fingerprint.cc b/fingerprint.cc
index 208290e..f9c6f65 100644
--- a/fingerprint.cc
+++ b/fingerprint.cc
@@ -220,7 +220,7 @@ struct Hasher {
std::unordered_map<Id, HashValue> Fingerprint(
const Graph& graph, Id root, Metrics& metrics) {
- Time x(metrics, "hash nodes");
+ const Time x(metrics, "hash nodes");
std::unordered_map<Id, HashValue> hashes;
std::unordered_set<Id> todo;
Hasher hasher(graph, hashes, todo, metrics);
diff --git a/input.cc b/input.cc
index f30cdca..5f2595c 100644
--- a/input.cc
+++ b/input.cc
@@ -41,19 +41,19 @@ Id ReadInternal(Graph& graph, InputFormat format, const char* input,
Metrics& metrics) {
switch (format) {
case InputFormat::ABI: {
- Time read(metrics, "read ABI");
+ const Time read(metrics, "read ABI");
return abixml::Read(graph, input, metrics);
}
case InputFormat::BTF: {
- Time read(metrics, "read BTF");
+ const Time read(metrics, "read BTF");
return btf::ReadFile(graph, input, options);
}
case InputFormat::ELF: {
- Time read(metrics, "read ELF");
+ const Time read(metrics, "read ELF");
return elf::Read(graph, input, options, file_filter, metrics);
}
case InputFormat::STG: {
- Time read(metrics, "read STG");
+ const Time read(metrics, "read STG");
return proto::Read(graph, input);
}
}
diff --git a/metrics_test.cc b/metrics_test.cc
index 9e7b6f9..b4b503e 100644
--- a/metrics_test.cc
+++ b/metrics_test.cc
@@ -41,7 +41,7 @@ TEST_CASE("times") {
std::ostringstream os;
{
stg::Metrics metrics(os, true);
- const std::array<stg::Time, count> timers = {
+ std::array<const stg::Time, count> timers = {
stg::Time(metrics, "name"),
stg::Time(metrics, "name"),
stg::Time(metrics, "name"),
diff --git a/stg.cc b/stg.cc
index 7d16a25..74a8cd6 100644
--- a/stg.cc
+++ b/stg.cc
@@ -102,7 +102,7 @@ void FilterSymbols(Graph& graph, Id root, const Filter& filter) {
void Write(const Graph& graph, Id root, const char* output, Metrics& metrics) {
std::ofstream os(output);
{
- Time x(metrics, "write");
+ const Time x(metrics, "write");
proto::Writer writer(graph);
writer.Write(root, os);
os << std::flush;
diff --git a/stgdiff.cc b/stgdiff.cc
index 9c5eea5..5a930f0 100644
--- a/stgdiff.cc
+++ b/stgdiff.cc
@@ -96,7 +96,7 @@ int RunExact(const Inputs& inputs, stg::ReadOptions options,
std::unordered_set<stg::Pair> equalities;
};
- stg::Time compute(metrics, "equality check");
+ const stg::Time compute(metrics, "equality check");
PairCache equalities;
return stg::Equals<PairCache>(graph, equalities)(roots[0], roots[1])
? 0
@@ -114,7 +114,7 @@ int Run(const Inputs& inputs, const Outputs& outputs, stg::Ignore ignore,
stg::Compare compare{graph, ignore, metrics};
std::pair<bool, std::optional<stg::Comparison>> result;
{
- stg::Time compute(metrics, "compute diffs");
+ const stg::Time compute(metrics, "compute diffs");
result = compare(roots[0], roots[1]);
}
stg::Check(compare.scc.Empty()) << "internal error: SCC state broken";
@@ -126,7 +126,7 @@ int Run(const Inputs& inputs, const Outputs& outputs, stg::Ignore ignore,
for (const auto& [format, filename] : outputs) {
std::ofstream output(filename);
if (comparison) {
- stg::Time report(metrics, "report diffs");
+ const stg::Time report(metrics, "report diffs");
stg::reporting::Options options{format, kMaxCrcOnlyChanges};
stg::reporting::Reporting reporting{graph, compare.outcomes, options,
names};