diff options
| author | Yangster-mac <yanglu@google.com> | 2018-05-14 19:22:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-14 19:22:33 -0700 |
| commit | 6d709b77c6120b09f5be747a9478a9e02ac069ae (patch) | |
| tree | 78f856f598e7c46d8d1c548091d2af659f345e1f | |
| parent | 743277e8660050d42bff51c54710d0585b97d800 (diff) | |
| parent | 5e60f88cab8a22d88d76f7fd49f5a6e9cc0d931b (diff) | |
| download | system_core-6d709b77c6120b09f5be747a9478a9e02ac069ae.tar.gz system_core-6d709b77c6120b09f5be747a9478a9e02ac069ae.tar.bz2 system_core-6d709b77c6120b09f5be747a9478a9e02ac069ae.zip | |
Only log the lmkd state change when the killing really happened.
am: 5e60f88cab
Change-Id: I95e347eeb0d69493a15ed11d32ca91d532eb043e
| -rw-r--r-- | lmkd/lmkd.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index 4bab6d6b4..1abd551df 100644 --- a/lmkd/lmkd.c +++ b/lmkd/lmkd.c @@ -1059,9 +1059,7 @@ static int find_and_kill_processes(enum vmpressure_level level, int pages_freed = 0; #ifdef LMKD_LOG_STATS - if (enable_stats_log) { - stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_START); - } + bool lmk_state_change_start = false; #endif for (i = OOM_SCORE_ADJ_MAX; i >= min_score_adj; i--) { @@ -1076,11 +1074,18 @@ static int find_and_kill_processes(enum vmpressure_level level, killed_size = kill_one_process(procp, min_score_adj, level); 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, FIRST_KILLING_DONE); + } +#endif + pages_freed += killed_size; if (pages_freed >= pages_to_free) { #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); } @@ -1092,7 +1097,7 @@ static int find_and_kill_processes(enum vmpressure_level level, } #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); } #endif |