[adb] Print fewer progress messages for push/pull
Windows console IO is terribly slow. Reducing the number of
printed progress messages speeds up the transfer rate
from 80 to 130 MB/s on Windows laptop
Bug: 151900478
Test: adb push/pull
Change-Id: I223284c8a662bd8f2b8ba280cdcc8c930d3e5205
diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp
index cc38926..94bd8f5 100644
--- a/adb/client/file_sync_client.cpp
+++ b/adb/client/file_sync_client.cpp
@@ -112,6 +112,7 @@
uint64_t bytes_transferred;
uint64_t bytes_expected;
bool expect_multiple_files;
+ std::string last_progress_str;
TransferLedger() {
Reset();
@@ -127,6 +128,7 @@
}
void Reset() {
+ last_progress_str.clear();
start_time = std::chrono::steady_clock::now();
files_transferred = 0;
files_skipped = 0;
@@ -181,7 +183,10 @@
android::base::StringPrintf("[%4s] %s", overall_percentage_str, file.c_str());
}
}
- lp.Print(output, LinePrinter::LineType::INFO);
+ if (output != last_progress_str) {
+ lp.Print(output, LinePrinter::LineType::INFO);
+ last_progress_str = std::move(output);
+ }
}
void ReportTransferRate(LinePrinter& lp, const std::string& name, TransferDirection direction) {