dolysis
/
snappy
mirror of https://github.com/google/snappy.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build errors. 

PiperOrigin-RevId: 278310119
This commit is contained in:
Victor Costan 2019-11-03 23:22:24 -08:00 committed by Victor Costan
parent eb2eb73e6b
commit c9212708b2
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
snappy-test.cc
View File

@ -67,7 +67,7 @@ std::string ReadTestDataFile(const std::string& base) {
return ReadTestDataFile(base, 0); return ReadTestDataFile(base, 0);
} }
std::string StringPrintf(const char* format, ...) { std::string StrFormat(const char* format, ...) {
char buf[4096]; char buf[4096];
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
@ -217,7 +217,7 @@ void Benchmark::Run() {
benchmark_runs[run].cpu_time_us = benchmark_cpu_time_us; benchmark_runs[run].cpu_time_us = benchmark_cpu_time_us;
} }
std::string heading = StringPrintf("%s/%d", name_.c_str(), test_case_num); std::string heading = StrFormat("%s/%d", name_.c_str(), test_case_num);
std::string human_readable_speed; std::string human_readable_speed;
std::nth_element(benchmark_runs, std::nth_element(benchmark_runs,
@ -232,15 +232,16 @@ void Benchmark::Run() {
int64 bytes_per_second = int64 bytes_per_second =
benchmark_bytes_processed * 1000000 / cpu_time_us; benchmark_bytes_processed * 1000000 / cpu_time_us;
if (bytes_per_second < 1024) { if (bytes_per_second < 1024) {
human_readable_speed = StringPrintf("%dB/s", bytes_per_second); human_readable_speed =
StrFormat("%dB/s", static_cast<int>(bytes_per_second));
} else if (bytes_per_second < 1024 * 1024) { } else if (bytes_per_second < 1024 * 1024) {
human_readable_speed = StringPrintf( human_readable_speed = StrFormat(
"%.1fkB/s", bytes_per_second / 1024.0f); "%.1fkB/s", bytes_per_second / 1024.0f);
} else if (bytes_per_second < 1024 * 1024 * 1024) { } else if (bytes_per_second < 1024 * 1024 * 1024) {
human_readable_speed = StringPrintf( human_readable_speed = StrFormat(
"%.1fMB/s", bytes_per_second / (1024.0f * 1024.0f)); "%.1fMB/s", bytes_per_second / (1024.0f * 1024.0f));
} else { } else {
human_readable_speed = StringPrintf( human_readable_speed = StrFormat(
"%.1fGB/s", bytes_per_second / (1024.0f * 1024.0f * 1024.0f)); "%.1fGB/s", bytes_per_second / (1024.0f * 1024.0f * 1024.0f));
} }
} }

2
snappy-test.h
View File

@ -187,7 +187,7 @@ std::string ReadTestDataFile(const std::string& base);
// A sprintf() variant that returns a std::string. // A sprintf() variant that returns a std::string.
// Not safe for general use due to truncation issues. // Not safe for general use due to truncation issues.
std::string StringPrintf(const char* format, ...); std::string StrFormat(const char* format, ...);
// A wall-time clock. This stub is not super-accurate, nor resistant to the // A wall-time clock. This stub is not super-accurate, nor resistant to the
// system time changing. // system time changing.

15
snappy_unittest.cc
View File

@ -346,7 +346,7 @@ static void Measure(const char* data,
float uncomp_rate = (length / utime[med]) * repeats / 1048576.0; float uncomp_rate = (length / utime[med]) * repeats / 1048576.0;
std::string x = names[comp]; std::string x = names[comp];
x += ":"; x += ":";
std::string urate = (uncomp_rate >= 0) ? absl::StrFormat("%.1f", uncomp_rate) std::string urate = (uncomp_rate >= 0) ? StrFormat("%.1f", uncomp_rate)
: std::string("?"); : std::string("?");
printf("%-7s [b %dM] bytes %6d -> %6d %4.1f%% " printf("%-7s [b %dM] bytes %6d -> %6d %4.1f%% "
"comp %5.1f MB/s uncomp %5s MB/s\n", "comp %5.1f MB/s uncomp %5s MB/s\n",
@ -582,7 +582,7 @@ TEST(CorruptedTest, VerifyCorrupted) {
// try reading stuff in from a bad file. // try reading stuff in from a bad file.
for (int i = 1; i <= 3; ++i) { for (int i = 1; i <= 3; ++i) {
std::string data = std::string data =
ReadTestDataFile(absl::StrFormat("baddata%d.snappy", i).c_str(), 0); ReadTestDataFile(StrFormat("baddata%d.snappy", i).c_str(), 0);
std::string uncmp; std::string uncmp;
// check that we don't return a crazy length // check that we don't return a crazy length
size_t ulen; size_t ulen;
@ -1401,10 +1401,11 @@ static void BM_ZFlat(int iters, int arg) {
StopBenchmarkTiming(); StopBenchmarkTiming();
const double compression_ratio = const double compression_ratio =
static_cast<double>(zsize) / std::max<size_t>(1, contents.size()); static_cast<double>(zsize) / std::max<size_t>(1, contents.size());
SetBenchmarkLabel(absl::StrFormat("%s (%.2f %%)", files[arg].label, SetBenchmarkLabel(StrFormat("%s (%.2f %%)", files[arg].label,
100.0 * compression_ratio)); 100.0 * compression_ratio));
VLOG(0) << StringPrintf("compression for %s: %zd -> %zd bytes", VLOG(0) << StrFormat("compression for %s: %zd -> %zd bytes",
files[arg].label, contents.size(), zsize); files[arg].label, static_cast<int>(contents.size()),
static_cast<int>(zsize));
delete[] dst; delete[] dst;
} }
BENCHMARK(BM_ZFlat)->DenseRange(0, ARRAYSIZE(files) - 1); BENCHMARK(BM_ZFlat)->DenseRange(0, ARRAYSIZE(files) - 1);
@ -1440,7 +1441,7 @@ static void BM_ZFlatAll(int iters, int arg) {
for (int i = 0; i < num_files; ++i) { for (int i = 0; i < num_files; ++i) {
delete[] dst[i]; delete[] dst[i];
} }
SetBenchmarkLabel(absl::StrFormat("%d files", num_files)); SetBenchmarkLabel(StrFormat("%d files", num_files));
} }
BENCHMARK(BM_ZFlatAll)->DenseRange(0, 0); BENCHMARK(BM_ZFlatAll)->DenseRange(0, 0);