fabi/Snappy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add absl::GetFlag and absl::SetFlag to uses of flags.

Browse Source 
PiperOrigin-RevId: 357807059
This commit is contained in:
Snappy Team
2021-02-16 22:35:17 +00:00
committed by Victor Costan
parent ea368c2f07
commit 453942b38f
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
snappy_test_tool.cc
View File

@@ -416,21 +416,25 @@ void MeasureFile(const char* fname) {
CHECK_OK(file::GetContents(fname, &fullinput, file::Defaults())); CHECK_OK(file::GetContents(fname, &fullinput, file::Defaults()));
std::printf("%-40s :\n", fname); 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(); int end_len = fullinput.size();
if (FLAGS_end_len >= 0) { if (absl::GetFlag(FLAGS_end_len) >= 0) {
end_len = std::min<int>(fullinput.size(), FLAGS_end_len); end_len = std::min<int>(fullinput.size(), absl::GetFlag(FLAGS_end_len));
} }
for (int len = start_len; len <= end_len; ++len) { for (int len = start_len; len <= end_len; ++len) {
const char* const input = fullinput.data(); const char* const input = fullinput.data();
int repeats = (FLAGS_bytes + len) / (len + 1); int repeats = (absl::GetFlag(FLAGS_bytes) + len) / (len + 1);
if (FLAGS_zlib) Measure(input, len, ZLIB, repeats, 1024 << 10); if (absl::GetFlag(FLAGS_zlib))
if (FLAGS_lzo) Measure(input, len, LZO, repeats, 1024 << 10); Measure(input, len, ZLIB, repeats, 1024 << 10);
if (FLAGS_lz4) Measure(input, len, LZ4, repeats, 1024 << 10); if (absl::GetFlag(FLAGS_lzo)) Measure(input, len, LZO, repeats, 1024 << 10);
if (FLAGS_snappy) Measure(input, len, SNAPPY, repeats, 4096 << 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 // 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, 8<<10);
Measure(input, len, SNAPPY, repeats, 16<<10); Measure(input, len, SNAPPY, repeats, 16<<10);
Measure(input, len, SNAPPY, repeats, 32<<10); Measure(input, len, SNAPPY, repeats, 32<<10);
@@ -449,9 +453,9 @@ int main(int argc, char** argv) {
InitGoogle(argv[0], &argc, &argv, true); InitGoogle(argv[0], &argc, &argv, true);
for (int arg = 1; arg < argc; ++arg) { for (int arg = 1; arg < argc; ++arg) {
if (FLAGS_write_compressed) { if (absl::GetFlag(FLAGS_write_compressed)) {
snappy::CompressFile(argv[arg]); snappy::CompressFile(argv[arg]);
} else if (FLAGS_write_uncompressed) { } else if (absl::GetFlag(FLAGS_write_uncompressed)) {
snappy::UncompressFile(argv[arg]); snappy::UncompressFile(argv[arg]);
} else { } else {
snappy::MeasureFile(argv[arg]); snappy::MeasureFile(argv[arg]);

6
snappy_unittest.cc
View File

@@ -461,7 +461,7 @@ TEST(Snappy, MaxBlowup) {
} }
TEST(Snappy, RandomData) { 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_3(0, 3);
std::uniform_int_distribution<int> uniform_0_to_8(0, 8); std::uniform_int_distribution<int> uniform_0_to_8(0, 8);
std::uniform_int_distribution<int> uniform_byte(0, 255); std::uniform_int_distribution<int> uniform_byte(0, 255);
@@ -834,7 +834,7 @@ TEST(Snappy, FindMatchLength) {
TEST(Snappy, FindMatchLengthRandom) { TEST(Snappy, FindMatchLengthRandom) {
constexpr int kNumTrials = 10000; constexpr int kNumTrials = 10000;
constexpr int kTypicalLength = 10; 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::uniform_int_distribution<int> uniform_byte(0, 255);
std::bernoulli_distribution one_in_two(1.0 / 2); std::bernoulli_distribution one_in_two(1.0 / 2);
std::bernoulli_distribution one_in_typical_length(1.0 / kTypicalLength); 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; 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 "); std::printf("static const uint16_t char_table[256] = {\n ");
for (int i = 0; i < 256; ++i) { for (int i = 0; i < 256; ++i) {
std::printf("0x%04x%s", std::printf("0x%04x%s",