wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd: Ensure node stats are being parsed am: f32fe4d7d3 am: 811f97adba 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2719093

Change-Id: I5f002ab4b6968aceacf342e0424a4b0e3dc260e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jaskaran Singh 2024-10-17 08:20:25 +00:00 committed by Automerger Merge Worker
parent 9d0787ef90 811f97adba
commit 853e5ac45a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lmkd.cpp
View File

@ -94,6 +94,7 @@ static inline void trace_kill_end() {}
#define PROC_STATUS_TGID_FIELD "Tgid:" #define PROC_STATUS_TGID_FIELD "Tgid:"
#define PROC_STATUS_RSS_FIELD "VmRSS:" #define PROC_STATUS_RSS_FIELD "VmRSS:"
#define PROC_STATUS_SWAP_FIELD "VmSwap:" #define PROC_STATUS_SWAP_FIELD "VmSwap:"
#define NODE_STATS_MARKER " per-node stats"
#define PERCEPTIBLE_APP_ADJ 200 #define PERCEPTIBLE_APP_ADJ 200
#define PREVIOUS_APP_ADJ 700 #define PREVIOUS_APP_ADJ 700
@ -1859,6 +1860,15 @@ static int zoneinfo_parse(struct zoneinfo *zi) {
int node_id; int node_id;
if (sscanf(line, "Node %d, zone %" STRINGIFY(LINE_MAX) "s", &node_id, zone_name) == 2) { if (sscanf(line, "Node %d, zone %" STRINGIFY(LINE_MAX) "s", &node_id, zone_name) == 2) {
if (!node || node->id != node_id) { if (!node || node->id != node_id) {
line = strtok_r(NULL, "\n", &save_ptr);
if (strncmp(line, NODE_STATS_MARKER, strlen(NODE_STATS_MARKER)) != 0) {
/*
* per-node stats are only present in the first non-empty zone of
* the node.
*/
continue;
}
/* new node is found */ /* new node is found */
if (node) { if (node) {
node->zone_count = zone_idx + 1; node->zone_count = zone_idx + 1;