Snap for 10103804 from fcc9c1a5928b2659378370c9ad38ed45888368f7 to mainline-tzdata5-release
Change-Id: I02e95aad9af737ff214d1c0c29e8edfd067f6e3d
diff --git a/README.md b/README.md
index b02d3db..538c410 100644
--- a/README.md
+++ b/README.md
@@ -26,75 +26,75 @@
lmkd can be configured on a particular system using the following Android
properties:
- ro.config.low_ram: choose between low-memory vs high-performance
- device. Default = false.
+ - `ro.config.low_ram`: choose between low-memory vs high-performance
+ device. Default = false.
- ro.lmk.use_minfree_levels: use free memory and file cache thresholds for
- making decisions when to kill. This mode works
- the same way kernel lowmemorykiller driver used
- to work. Default = false
+ - `ro.lmk.use_minfree_levels`: use free memory and file cache thresholds for
+ making decisions when to kill. This mode works
+ the same way kernel lowmemorykiller driver used
+ to work. Default = false
- ro.lmk.low: min oom_adj score for processes eligible to be
- killed at low vmpressure level. Default = 1001
- (disabled)
+ - `ro.lmk.low`: min oom_adj score for processes eligible to be
+ killed at low vmpressure level. Default = 1001
+ (disabled)
- ro.lmk.medium: min oom_adj score for processes eligible to be
- killed at medium vmpressure level. Default = 800
- (non-essential processes)
+ - `ro.lmk.medium`: min oom_adj score for processes eligible to be
+ killed at medium vmpressure level. Default = 800
+ (non-essential processes)
- ro.lmk.critical: min oom_adj score for processes eligible to be
- killed at critical vmpressure level. Default = 0
- (all processes)
+ - `ro.lmk.critical`: min oom_adj score for processes eligible to be
+ killed at critical vmpressure level. Default = 0
+ (all processes)
- ro.lmk.critical_upgrade: enables upgrade to critical level. Default = false
+ - `ro.lmk.critical_upgrade`: enables upgrade to critical level. Default = false
- ro.lmk.upgrade_pressure: max mem_pressure at which level will be upgraded
- because system is swapping too much. Default = 100
- (disabled)
+ - `ro.lmk.upgrade_pressure`: max mem_pressure at which level will be upgraded
+ because system is swapping too much. Default = 100
+ (disabled)
- ro.lmk.downgrade_pressure: min mem_pressure at which vmpressure event will
- be ignored because enough free memory is still
- available. Default = 100 (disabled)
+ - `ro.lmk.downgrade_pressure`: min mem_pressure at which vmpressure event will
+ be ignored because enough free memory is still
+ available. Default = 100 (disabled)
- ro.lmk.kill_heaviest_task: kill heaviest eligible task (best decision) vs.
- any eligible task (fast decision). Default = false
+ - `ro.lmk.kill_heaviest_task`: kill heaviest eligible task (best decision) vs.
+ any eligible task (fast decision). Default = false
- ro.lmk.kill_timeout_ms: duration in ms after a kill when no additional
- kill will be done. Default = 0 (disabled)
+ - `ro.lmk.kill_timeout_ms`: duration in ms after a kill when no additional
+ kill will be done. Default = 0 (disabled)
- ro.lmk.debug: enable lmkd debug logs, Default = false
+ - `ro.lmk.debug`: enable lmkd debug logs, Default = false
- ro.lmk.swap_free_low_percentage: level of free swap as a percentage of the
- total swap space used as a threshold to consider
- the system as swap space starved. Default for
- low-RAM devices = 10, for high-end devices = 20
+ - `ro.lmk.swap_free_low_percentage`: level of free swap as a percentage of the
+ total swap space used as a threshold to consider
+ the system as swap space starved. Default for
+ low-RAM devices = 10, for high-end devices = 20
- ro.lmk.thrashing_limit: number of workingset refaults as a percentage of
- the file-backed pagecache size used as a threshold
- to consider system thrashing its pagecache.
- Default for low-RAM devices = 30, for high-end
- devices = 100
+ - `ro.lmk.thrashing_limit`: number of workingset refaults as a percentage of
+ the file-backed pagecache size used as a threshold
+ to consider system thrashing its pagecache.
+ Default for low-RAM devices = 30, for high-end
+ devices = 100
- ro.lmk.thrashing_limit_decay: thrashing threshold decay expressed as a
- percentage of the original threshold used to lower
- the threshold when system does not recover even
- after a kill. Default for low-RAM devices = 50,
- for high-end devices = 10
+ - `ro.lmk.thrashing_limit_decay`: thrashing threshold decay expressed as a
+ percentage of the original threshold used to lower
+ the threshold when system does not recover even
+ after a kill. Default for low-RAM devices = 50,
+ for high-end devices = 10
- ro.lmk.psi_partial_stall_ms: partial PSI stall threshold in milliseconds for
- triggering low memory notification. Default for
- low-RAM devices = 200, for high-end devices = 70
+ - `ro.lmk.psi_partial_stall_ms`: partial PSI stall threshold in milliseconds for
+ triggering low memory notification. Default for
+ low-RAM devices = 200, for high-end devices = 70
- ro.lmk.psi_complete_stall_ms: complete PSI stall threshold in milliseconds for
- triggering critical memory notification. Default =
- 700
+ - `ro.lmk.psi_complete_stall_ms`: complete PSI stall threshold in milliseconds for
+ triggering critical memory notification. Default =
+ 700
lmkd will set the following Android properties according to current system
configurations:
- sys.lmk.minfree_levels: minfree:oom_adj_score pairs, delimited by comma
+ - `sys.lmk.minfree_levels`: minfree:oom_adj_score pairs, delimited by comma
- sys.lmk.reportkills: whether or not it supports reporting process kills
- to clients. Test app should check this property
- before testing low memory kill notification.
- Default will be unset.
+ - `sys.lmk.reportkills`: whether or not it supports reporting process kills
+ to clients. Test app should check this property
+ before testing low memory kill notification.
+ Default will be unset.
diff --git a/lmkd.cpp b/lmkd.cpp
index d25545f..fcb06fe 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -2348,7 +2348,7 @@
snprintf(desc, sizeof(desc), "lmk,%d,%d,%d,%d,%d", pid, ki ? (int)ki->kill_reason : -1,
procp->oomadj, min_oom_score, ki ? ki->max_thrashing : -1);
- result = lmkd_free_memory_before_kill_hook(procp, rss_kb / page_k, min_oom_score,
+ result = lmkd_free_memory_before_kill_hook(procp, rss_kb / page_k, procp->oomadj,
ki ? (int)ki->kill_reason : -1);
if (result > 0) {
/*
