Snap for 4787078 from 7905b1e16286653679b7ff9b595f3ed7de5e182f to pi-release

Change-Id: Id0a5125ffd734a0b158ab867f8ffd9c0e0ae930a
This commit is contained in:
android-build-team Robot 2018-05-17 07:22:36 +00:00
commit f73aab11e7
1 changed files with 11 additions and 5 deletions

16
lmkd.c
View File

@ -1026,9 +1026,7 @@ static int find_and_kill_processes(enum vmpressure_level level,
int pages_freed = 0; int pages_freed = 0;
#ifdef LMKD_LOG_STATS #ifdef LMKD_LOG_STATS
if (enable_stats_log) { bool lmk_state_change_start = false;
stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_START);
}
#endif #endif
for (i = OOM_SCORE_ADJ_MAX; i >= min_score_adj; i--) { for (i = OOM_SCORE_ADJ_MAX; i >= min_score_adj; i--) {
@ -1043,11 +1041,19 @@ static int find_and_kill_processes(enum vmpressure_level level,
killed_size = kill_one_process(procp, min_score_adj, level); killed_size = kill_one_process(procp, min_score_adj, level);
if (killed_size >= 0) { if (killed_size >= 0) {
#ifdef LMKD_LOG_STATS
if (enable_stats_log && !lmk_state_change_start) {
lmk_state_change_start = true;
stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED,
LMK_STATE_CHANGE_START);
}
#endif
pages_freed += killed_size; pages_freed += killed_size;
if (pages_freed >= pages_to_free) { if (pages_freed >= pages_to_free) {
#ifdef LMKD_LOG_STATS #ifdef LMKD_LOG_STATS
if (enable_stats_log) { if (enable_stats_log && lmk_state_change_start) {
stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED,
LMK_STATE_CHANGE_STOP); LMK_STATE_CHANGE_STOP);
} }
@ -1059,7 +1065,7 @@ static int find_and_kill_processes(enum vmpressure_level level,
} }
#ifdef LMKD_LOG_STATS #ifdef LMKD_LOG_STATS
if (enable_stats_log) { if (enable_stats_log && lmk_state_change_start) {
stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_STOP); stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_STOP);
} }
#endif #endif