diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-05-14 20:31:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-14 20:31:29 -0700 |
| commit | 971f23bf661cc8cd0591ff62375cecc63f631988 (patch) | |
| tree | cef182a36e3ec0fd18577905e661763ce417f929 /lmkd | |
| parent | 6d709b77c6120b09f5be747a9478a9e02ac069ae (diff) | |
| parent | 0051684905e093c8c8ac5cc9f861392fea9d0b0c (diff) | |
| download | system_core-971f23bf661cc8cd0591ff62375cecc63f631988.tar.gz system_core-971f23bf661cc8cd0591ff62375cecc63f631988.tar.bz2 system_core-971f23bf661cc8cd0591ff62375cecc63f631988.zip | |
Revert "Only log the lmkd state change when the killing really happened."
am: 0051684905
Change-Id: I3fc6842348d7ede95dd5fcdca06271d90c4facb4
Diffstat (limited to 'lmkd')
| -rw-r--r-- | lmkd/lmkd.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index 1abd551df..4bab6d6b4 100644 --- a/lmkd/lmkd.c +++ b/lmkd/lmkd.c @@ -1059,7 +1059,9 @@ static int find_and_kill_processes(enum vmpressure_level level, int pages_freed = 0; #ifdef LMKD_LOG_STATS - bool lmk_state_change_start = false; + if (enable_stats_log) { + stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_START); + } #endif for (i = OOM_SCORE_ADJ_MAX; i >= min_score_adj; i--) { @@ -1074,18 +1076,11 @@ 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 && lmk_state_change_start) { + if (enable_stats_log) { stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_STOP); } @@ -1097,7 +1092,7 @@ static int find_and_kill_processes(enum vmpressure_level level, } #ifdef LMKD_LOG_STATS - if (enable_stats_log && lmk_state_change_start) { + if (enable_stats_log) { stats_write_lmk_state_changed(log_ctx, LMK_STATE_CHANGED, LMK_STATE_CHANGE_STOP); } #endif |