wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd/tests: do not fail when occasionally reaping time is reported as 0 am: 90c4e26b9f am: 770c130e07 am: 361e23c48a 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2776306

Change-Id: I1b9743ce2485d7ea38f1df68b3bbb812d41b2010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Suren Baghdasaryan 2023-10-06 00:48:17 +00:00 committed by Automerger Merge Worker
parent a04ad4db3b 361e23c48a
commit c405cc646e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/lmkd_tests.cpp
View File

@ -228,12 +228,15 @@ TEST_F(LmkdTest, TargetReaping) {
line = logcat_out.substr( line = logcat_out.substr(
line_start, line_end == std::string::npos ? std::string::npos : line_end - line_start); line_start, line_end == std::string::npos ? std::string::npos : line_end - line_start);
long reap_time; long reap_time;
ASSERT_TRUE(ParseReapTime(line, pid, reap_time) && reap_time > 0) ASSERT_TRUE(ParseReapTime(line, pid, reap_time) && reap_time >= 0)
<< "Reaping time report format is invalid"; << "Reaping time report format is invalid";
// occasionally the reaping happens quickly enough that it's reported as 0ms
if (reap_time > 0) {
double reclaim_speed = ((double)rss + swap) / reap_time; double reclaim_speed = ((double)rss + swap) / reap_time;
GTEST_LOG_(INFO) << "Reclaim speed " << reclaim_speed << "kB/ms (" << rss << "kB rss + " << swap GTEST_LOG_(INFO) << "Reclaim speed " << reclaim_speed << "kB/ms (" << rss << "kB rss + "
<< "kB swap) / " << reap_time << "ms"; << swap << "kB swap) / " << reap_time << "ms";
}
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {