Fix variable type in for loop to match type comparison am: fa6befc915android-u-beta-1-gpl

Original change: https://android-review.googlesource.com/c/platform/test/dittosuite/+/2393134

Change-Id: I651ee605b2828252d45d8c0acb61a98af18b3737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8 files changed, 10 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index f713cb8..c2324fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,7 @@ cc_defaults {
       "-Wall",
       "-Werror",
       "-Wextra",
+      "-Wsign-compare",
     ],
     tidy: true,
     /*
diff --git a/dittotrace.cpp b/dittotrace.cpp
index 98a0e31..47a1bc2 100644
--- a/dittotrace.cpp
+++ b/dittotrace.cpp
@@ -89,7 +89,7 @@ std::map<int, std::vector<Syscall>> ProcessLines(
   std::map<int, std::vector<Syscall>> processed_syscalls_by_pid;
 
   for (const auto& [pid, lines] : lines_by_pid) {
-    for (unsigned int i = 0; i < lines.size(); ++i) {
+    for (std::size_t i = 0; i < lines.size(); ++i) {
       auto line = lines[i];
 
       // If only the resumed part of the syscall was found, ignore it
diff --git a/src/instruction_set.cpp b/src/instruction_set.cpp
index aeb14ab..1da105c 100644
--- a/src/instruction_set.cpp
+++ b/src/instruction_set.cpp
@@ -66,7 +66,7 @@ void InstructionSet::RunSingle() {
     std::visit(overloaded{[&](const std::vector<std::string>& list) {
                             std::uniform_int_distribution<> uniform_distribution(0,
                                                                                  list.size() - 1);
-                            for (unsigned int i = 0; i < list.size(); ++i) {
+                            for (std::size_t i = 0; i < list.size(); ++i) {
                               switch (access_order_) {
                                 case Order::kSequential: {
                                   SharedVariables::Set(item_key_, list[i]);
@@ -115,7 +115,7 @@ std::unique_ptr<Result> InstructionSet::CollectResults(const std::string& prefix
       duration.resize(samples.size() / repeat);
     }
 
-    for (unsigned int i = 0; i < samples.size() / repeat; ++i) {
+    for (std::size_t i = 0; i < samples.size() / repeat; ++i) {
       for (int j = 0; j < repeat; ++j) {
         duration[i] += samples[i * repeat + j];
       }
diff --git a/src/multithreading.cpp b/src/multithreading.cpp
index 0ec8875..ed8dcf7 100644
--- a/src/multithreading.cpp
+++ b/src/multithreading.cpp
@@ -52,7 +52,7 @@ void Multithreading::TearDownSingle() {
 std::unique_ptr<Result> Multithreading::CollectResults(const std::string& prefix) {
   auto result = std::make_unique<Result>(prefix + name_, repeat_);
   result->AddMeasurement("duration", TimespecToDoubleNanos(time_sampler_.GetSamples()));
-  for (unsigned int i = 0; i < instructions_.size(); ++i) {
+  for (std::size_t i = 0; i < instructions_.size(); ++i) {
     result->AddSubResult(instructions_[i]->CollectResults(std::to_string(i) + "/"));
   }
   return result;
diff --git a/src/parser.cpp b/src/parser.cpp
index 98f1db9..f0e98ec 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -50,7 +50,7 @@ void Parser::Parse(const std::string& file_path, const std::vector<std::string>&
   std::string file_contents((std::istreambuf_iterator<char>(file)),
                             (std::istreambuf_iterator<char>()));
 
-  for (unsigned int i = 0; i < parameters.size(); i++) {
+  for (std::size_t i = 0; i < parameters.size(); i++) {
     std::string to_replace("$PARAMETER_" + std::to_string(i + 1) + "$");
     auto position = file_contents.find(to_replace);
     if (position == std::string::npos) {
diff --git a/src/result.cpp b/src/result.cpp
index 702de49..e154700 100644
--- a/src/result.cpp
+++ b/src/result.cpp
@@ -194,7 +194,7 @@ void Result::PrintHistogramHeader(const std::string& measurement_name) {
 void Result::MakeHistogramFromVector(const std::vector<int>& freq_vector, const int min_value) {
   int sum = 0;
   int max_frequency = *std::max_element(freq_vector.begin(), freq_vector.end());
-  for (unsigned int i = 0; i < freq_vector.size(); i++) {
+  for (std::size_t i = 0; i < freq_vector.size(); i++) {
     std::cout.width(kSampleDisplayWidth);
     std::cout << min_value + bin_size * i << kTableDivider;
 
diff --git a/src/shared_variables.cpp b/src/shared_variables.cpp
index 5080d6a..b27c2b6 100644
--- a/src/shared_variables.cpp
+++ b/src/shared_variables.cpp
@@ -36,7 +36,7 @@ int SharedVariables::GetKey(const std::list<int>& thread_ids, const std::string&
   }
 
   // If the key does not exist, create it for the current thread
-  int key = variables_.size();
+  std::size_t key = variables_.size();
   keys_[thread_ids.back()].insert({variable_name, key});
   variables_.resize(variables_.size() + 1);
   return key;
diff --git a/test/timespec_utils_test.cpp b/test/timespec_utils_test.cpp
index c870cf8..8805b20 100644
--- a/test/timespec_utils_test.cpp
+++ b/test/timespec_utils_test.cpp
@@ -26,13 +26,13 @@ std::vector<int64_t> tss_ns = {0,          1,          1000000000, 1000000001,
                                1999999999, 2000000002, 2000000003, 3000000001};
 
 TEST(TimespecUtilsTest, TimespecToNanos) {
-  for (unsigned int i = 0; i < tss.size(); ++i) {
+  for (std::size_t i = 0; i < tss.size(); ++i) {
     ASSERT_EQ(TimespecToNanos(tss[i]), tss_ns[i]);
   }
 }
 
 TEST(TimespecUtilsTest, NanosToTimespec) {
-  for (unsigned int i = 0; i < tss.size(); ++i) {
+  for (std::size_t i = 0; i < tss.size(); ++i) {
     ASSERT_EQ(tss[i], NanosToTimespec(tss_ns[i]));
   }
 }