From 453942b38fa3317c7580f1d8478bdcfd83ea6149 Mon Sep 17 00:00:00 2001
From: Snappy Team <no-reply@google.com>
Date: Tue, 16 Feb 2021 22:35:17 +0000
Subject: Add absl::GetFlag and absl::SetFlag to uses of flags.

PiperOrigin-RevId: 357807059
---
 snappy_test_tool.cc | 26 +++++++++++++++-----------
 snappy_unittest.cc  |  6 +++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/snappy_test_tool.cc b/snappy_test_tool.cc
index c5c195a..f566167 100644
--- a/snappy_test_tool.cc
+++ b/snappy_test_tool.cc
@@ -416,21 +416,25 @@ void MeasureFile(const char* fname) {
   CHECK_OK(file::GetContents(fname, &fullinput, file::Defaults()));
   std::printf("%-40s :\n", fname);
 
-  int start_len = (FLAGS_start_len < 0) ? fullinput.size() : FLAGS_start_len;
+  int start_len = (absl::GetFlag(FLAGS_start_len) < 0)
+                      ? fullinput.size()
+                      : absl::GetFlag(FLAGS_start_len);
   int end_len = fullinput.size();
-  if (FLAGS_end_len >= 0) {
-    end_len = std::min<int>(fullinput.size(), FLAGS_end_len);
+  if (absl::GetFlag(FLAGS_end_len) >= 0) {
+    end_len = std::min<int>(fullinput.size(), absl::GetFlag(FLAGS_end_len));
   }
   for (int len = start_len; len <= end_len; ++len) {
     const char* const input = fullinput.data();
-    int repeats = (FLAGS_bytes + len) / (len + 1);
-    if (FLAGS_zlib) Measure(input, len, ZLIB, repeats, 1024 << 10);
-    if (FLAGS_lzo) Measure(input, len, LZO, repeats, 1024 << 10);
-    if (FLAGS_lz4) Measure(input, len, LZ4, repeats, 1024 << 10);
-    if (FLAGS_snappy) Measure(input, len, SNAPPY, repeats, 4096 << 10);
+    int repeats = (absl::GetFlag(FLAGS_bytes) + len) / (len + 1);
+    if (absl::GetFlag(FLAGS_zlib))
+      Measure(input, len, ZLIB, repeats, 1024 << 10);
+    if (absl::GetFlag(FLAGS_lzo)) Measure(input, len, LZO, repeats, 1024 << 10);
+    if (absl::GetFlag(FLAGS_lz4)) Measure(input, len, LZ4, repeats, 1024 << 10);
+    if (absl::GetFlag(FLAGS_snappy))
+      Measure(input, len, SNAPPY, repeats, 4096 << 10);
 
     // For block-size based measurements
-    if (0 && FLAGS_snappy) {
+    if (0 && absl::GetFlag(FLAGS_snappy)) {
       Measure(input, len, SNAPPY, repeats, 8<<10);
       Measure(input, len, SNAPPY, repeats, 16<<10);
       Measure(input, len, SNAPPY, repeats, 32<<10);
@@ -449,9 +453,9 @@ int main(int argc, char** argv) {
   InitGoogle(argv[0], &argc, &argv, true);
 
   for (int arg = 1; arg < argc; ++arg) {
-    if (FLAGS_write_compressed) {
+    if (absl::GetFlag(FLAGS_write_compressed)) {
       snappy::CompressFile(argv[arg]);
-    } else if (FLAGS_write_uncompressed) {
+    } else if (absl::GetFlag(FLAGS_write_uncompressed)) {
       snappy::UncompressFile(argv[arg]);
     } else {
       snappy::MeasureFile(argv[arg]);
diff --git a/snappy_unittest.cc b/snappy_unittest.cc
index 0adacb7..14c633c 100644
--- a/snappy_unittest.cc
+++ b/snappy_unittest.cc
@@ -461,7 +461,7 @@ TEST(Snappy, MaxBlowup) {
 }
 
 TEST(Snappy, RandomData) {
-  std::minstd_rand0 rng(FLAGS_test_random_seed);
+  std::minstd_rand0 rng(absl::GetFlag(FLAGS_test_random_seed));
   std::uniform_int_distribution<int> uniform_0_to_3(0, 3);
   std::uniform_int_distribution<int> uniform_0_to_8(0, 8);
   std::uniform_int_distribution<int> uniform_byte(0, 255);
@@ -834,7 +834,7 @@ TEST(Snappy, FindMatchLength) {
 TEST(Snappy, FindMatchLengthRandom) {
   constexpr int kNumTrials = 10000;
   constexpr int kTypicalLength = 10;
-  std::minstd_rand0 rng(FLAGS_test_random_seed);
+  std::minstd_rand0 rng(absl::GetFlag(FLAGS_test_random_seed));
   std::uniform_int_distribution<int> uniform_byte(0, 255);
   std::bernoulli_distribution one_in_two(1.0 / 2);
   std::bernoulli_distribution one_in_typical_length(1.0 / kTypicalLength);
@@ -938,7 +938,7 @@ TEST(Snappy, VerifyCharTable) {
     EXPECT_NE(0xffff, dst[i]) << "Did not assign byte " << i;
   }
 
-  if (FLAGS_snappy_dump_decompression_table) {
+  if (absl::GetFlag(FLAGS_snappy_dump_decompression_table)) {
     std::printf("static const uint16_t char_table[256] = {\n  ");
     for (int i = 0; i < 256; ++i) {
       std::printf("0x%04x%s",
-- 
cgit v1.2.1