Be consistent about "kilo" versus "kibi".
I'm a binary man myself, but we've mostly used decimal so far, and wider
Android is mostly decimal, so...
Change-Id: Ibef78f61176569e0023a7f43196a3969c7fe794b
diff --git a/src/hprof/hprof.cc b/src/hprof/hprof.cc
index 532eada..ce3050e 100644
--- a/src/hprof/hprof.cc
+++ b/src/hprof/hprof.cc
@@ -593,7 +593,7 @@
}
// throw out a log message for the benefit of "runhat"
- LOG(INFO) << "hprof: heap dump completed (" << ((headCtx.file_data_size_ + file_data_size_ + 1023) / KB) << "KiB)";
+ LOG(INFO) << "hprof: heap dump completed (" << PrettySize(headCtx.file_data_size_ + file_data_size_ + 1023) << ")";
return true;
}
diff --git a/src/thread_list.cc b/src/thread_list.cc
index 0e01c0d..6c0a592 100644
--- a/src/thread_list.cc
+++ b/src/thread_list.cc
@@ -31,7 +31,7 @@
thread_exit_cond_("thread_exit_cond_"),
thread_suspend_count_lock_("thread suspend count lock", kThreadSuspendCountLock),
thread_suspend_count_cond_("thread_suspend_count_cond_") {
- VLOG(threads) << "Default stack size: " << Runtime::Current()->GetDefaultStackSize() / KB << "KiB";
+ VLOG(threads) << "Default stack size: " << PrettySize(Runtime::Current()->GetDefaultStackSize());
}
ThreadList::~ThreadList() {
diff --git a/src/utils.cc b/src/utils.cc
index 1c00712..127c18f 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -351,7 +351,7 @@
} else if ((size_in_bytes / MB) * MB == size_in_bytes) {
return StringPrintf("%zdMB", size_in_bytes / MB);
} else if ((size_in_bytes / KB) * KB == size_in_bytes) {
- return StringPrintf("%zdKiB", size_in_bytes / KB);
+ return StringPrintf("%zdKB", size_in_bytes / KB);
} else {
return StringPrintf("%zdB", size_in_bytes);
}
diff --git a/src/utils_test.cc b/src/utils_test.cc
index 3c93e4d..e0b2139 100644
--- a/src/utils_test.cc
+++ b/src/utils_test.cc
@@ -138,9 +138,9 @@
EXPECT_EQ("1MB", PrettySize(1 * MB));
EXPECT_EQ("10MB", PrettySize(10 * MB));
EXPECT_EQ("100MB", PrettySize(100 * MB));
- EXPECT_EQ("1KiB", PrettySize(1 * KB));
- EXPECT_EQ("10KiB", PrettySize(10 * KB));
- EXPECT_EQ("100KiB", PrettySize(100 * KB));
+ EXPECT_EQ("1KB", PrettySize(1 * KB));
+ EXPECT_EQ("10KB", PrettySize(10 * KB));
+ EXPECT_EQ("100KB", PrettySize(100 * KB));
EXPECT_EQ("1B", PrettySize(1));
EXPECT_EQ("10B", PrettySize(10));
EXPECT_EQ("100B", PrettySize(100));