commit 7522da303617e6587d7e2e237fdda155a779a40d
author Daniel Rosenberg <drosen@google.com> Wed Mar 27 02:01:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 27 02:01:48 2019 +0000
tree 19d7e808e2f22ae9fadf9d579f9b11017adab478
parent 93fb6083d407add1ea75a2bb110305cec454a15d
parent 18d10d4c15baed1e5f6dd17743589f0928c5048b

Merge "Fixed min_free_bytes prop name and usleep time default"

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 1a89039..3392be5 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -262,7 +262,7 @@
 
 namespace {
 const std::string kSleepTimeProp = "ro.sys.cp_usleeptime";
-const uint32_t usleeptime_default = 1000;  // 1 s
+const uint32_t usleeptime_default = 1000000;  // 1 s
 
 const std::string kMinFreeBytesProp = "ro.sys.cp_min_free_bytes";
 const uint64_t min_free_bytes_default = 100 * (1 << 20);  // 100 MiB
@@ -274,7 +274,8 @@
     struct statvfs data;
     uint64_t free_bytes = 0;
     uint32_t usleeptime = GetUintProperty(kSleepTimeProp, usleeptime_default, (uint32_t)-1);
-    uint64_t min_free_bytes = GetUintProperty(kSleepTimeProp, min_free_bytes_default, (uint64_t)-1);
+    uint64_t min_free_bytes =
+        GetUintProperty(kMinFreeBytesProp, min_free_bytes_default, (uint64_t)-1);
     bool commit_on_full = GetBoolProperty(kCommitOnFullProp, commit_on_full_default);
 
     while (isCheckpointing) {