lmkd/tests: do not fail when occasionally reaping time is reported as 0 am: 90c4e26b9f am: 770c130e07 am: 361e23c48a am: c405cc646e am: f6735b0b3a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2776306 Change-Id: I2aa940705d9ebba77f7f27cd415f4a0e02c501a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
9cfae5f47b
|
|
@ -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";
|
||||||
|
|
||||||
double reclaim_speed = ((double)rss + swap) / reap_time;
|
// occasionally the reaping happens quickly enough that it's reported as 0ms
|
||||||
GTEST_LOG_(INFO) << "Reclaim speed " << reclaim_speed << "kB/ms (" << rss << "kB rss + " << swap
|
if (reap_time > 0) {
|
||||||
<< "kB swap) / " << reap_time << "ms";
|
double reclaim_speed = ((double)rss + swap) / reap_time;
|
||||||
|
GTEST_LOG_(INFO) << "Reclaim speed " << reclaim_speed << "kB/ms (" << rss << "kB rss + "
|
||||||
|
<< swap << "kB swap) / " << reap_time << "ms";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue