commit 5dd550518ab7dd355b22eb530bab1b978681a76d
author Dan Willemsen <dwillemsen@google.com> Mon May 14 20:35:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 14 20:35:38 2018 -0700
tree 84fecd6bb495020eededeeac9e479100a3885ada
parent 770544ac178fcbd0a9752c1c06ad6c9a40a7d017
parent 57b0316aa67eefd0fecd500d8e03f0c29d6540b0

Revert "Only log the lmkd state change when the killing really happened." am: 0051684905
am: 971f23bf66

Change-Id: Ia57c8d7e63c538442780fa20809c886a3af31941

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index c9baad6..fa205a9 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -1062,7 +1062,9 @@
     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--) {
@@ -1077,18 +1079,11 @@
 
             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);
                     }
@@ -1100,7 +1095,7 @@
     }
 
 #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