Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b258561 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Revert "Only log the lmkd state change when the killing really happened." am: 00516849

am: 971f23bf

Change-Id: Ia57c8d7e63c538442780fa20809c886a3af31941
parents 895065d0 971f23bf
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
@@ -1062,7 +1062,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--) {
@@ -1077,18 +1079,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);
                    }
@@ -1100,7 +1095,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