7698be7dee
[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b494068d81 am: 7b42292af3 am: 61e2948e80 -s ours am: c55de10437 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156
Change-Id: I33a0a4cfaf369cb5c0473acab31bf16ca22177ca
2021-06-13 23:55:55 +00:00
c55de10437
[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b494068d81 am: 7b42292af3 am: 61e2948e80 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156
Change-Id: I06cfb3f1359cb7774325beb03e90e5c2c5796356
2021-06-13 23:47:51 +00:00
61e2948e80
DO NOT MERGE - Merge ab/7272582 am: b494068d81 am: 7b42292af3
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156
Change-Id: I4b76aa439db36731a599125341100d9f81f0fdb4
2021-06-13 23:30:38 +00:00
7b42292af3
DO NOT MERGE - Merge ab/7272582 am: b494068d81
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156
Change-Id: I94c864786f2d51e5f265921fa1a332ba6443a9ac
2021-06-13 23:13:21 +00:00
b494068d81
DO NOT MERGE - Merge ab/7272582
...
Bug: 190855093
Change-Id: I42de6c44d675f5acc076df33083f8fe87da7031a
2021-06-11 17:33:57 -07:00
621c9bee5f
Merge sc-mainline-prod
...
Bug: 189946434
Change-Id: Icbd2498a6d46d9f8d47e000025a546336f4e96ba
2021-06-02 16:53:00 +00:00
4b85b5c5fd
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 am: 3eaa6dbd6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: Ic9fa32b94b395a193eafd61ad2fce3c989b3dce8
2021-05-19 11:14:00 +00:00
82d2c16f99
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours am: 482300d472 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: Ia54564df92face76056b59263438c497c94a1d3c
2021-05-19 10:55:30 +00:00
a7e8c3f765
lmkd: reroute atoms logging to AMS am: 6f11aff418 am: 45fa6a05cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: I368b761665596af5aac38b9c3818a2115ca7698e
2021-05-19 10:24:03 +00:00
e203067700
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001 am: 1174827c4d
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: If728cc5a0edf03d0406adaad0c0a719d1b07b0d9
2021-05-19 09:27:24 +00:00
fd5a6f4ff0
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 am: a6152b9a07 am: 6426247116
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: I692ef0d835902c4d8c4e7110413b398ceede3333
2021-05-18 19:30:47 +00:00
fd293a6f84
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours am: f96602bb3b -s ours am: 1779e3b776 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: I4e0bed296d62f8ee549fef6fbc866c7a1220dedc
2021-05-18 11:38:43 +00:00
8496d7f7c1
lmkd: reroute atoms logging to AMS am: 6f11aff418 am: 56a9b111e6 am: 35804ede5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: Id4b21bbcc1029ab9c5b2b7ff83d660dd02977452
2021-05-18 10:33:23 +00:00
a759007e7d
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001 am: a8c2e1ece9 am: 4de47eb096
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: I18119ddbc22480c7a5e0e57642896706e8a15b49
2021-05-17 10:30:02 +00:00
f32c144de7
lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06 am: c30dd665ba am: e67d7be9e4 am: d9cae1e040
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347
Change-Id: Ic1d3a3b5363a532f6fcb6f051d5f9c285b2b4bc4
2021-05-17 09:40:38 +00:00
6426247116
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 am: a6152b9a07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: Iaaa041661a16c0f8ae8fb411309ec05f5f0c98d6
2021-05-14 23:52:30 +00:00
a6152b9a07
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: Id8a7eb3d56e281de8e55c48f51c9cf65529685b0
2021-05-14 23:13:09 +00:00
13876bb9ad
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: I69fa090c4c0da7fc5ae231aae2a96693ef4348fa
2021-05-14 23:11:24 +00:00
3eaa6dbd6b
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: Ieb50968b6823cafa09ab8524bfebd5d15716bc9b
2021-05-14 23:11:04 +00:00
449e1017e1
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: Id82515f2cfe0e98d8dd6ad419c2544941642404a
2021-05-14 22:49:07 +00:00
b928e5d6ec
lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833
Change-Id: Ib6bbcb1c14669730e7896ac024dadc5bd4837283
2021-05-14 22:31:25 +00:00
1779e3b776
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours am: f96602bb3b -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: I581871f6145b0e2deef96581c934d715f90a04d2
2021-05-11 19:48:21 +00:00
f96602bb3b
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: Ia82b9d6ae8d174c9e7ddd385e6491e4e0d8d7960
2021-05-11 18:59:24 +00:00
482300d472
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: I168cb5ddd03bf5cdca1fecaa684b7ed922d8b903
2021-05-11 18:18:59 +00:00
ea9c0f6c4e
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: I0f52642d74b05fa966c876c4ca62a9af8b2562c8
2021-05-11 18:18:55 +00:00
429ef96a49
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: Idd181e6058f33a6c68f0571525c134e81e1b1f3d
2021-05-11 18:18:36 +00:00
4e810afb15
[automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours
...
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: Ie1006f13729e16b267a5819c8d665b4b2645fd9d
2021-05-11 18:14:21 +00:00
94be9d6516
lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: Ie377b3e52d0ec3175dc81b3c765ab2bf39b0dc15
2021-05-11 18:04:07 +00:00
ea85216d08
lmkd: reroute atoms logging to AMS am: a92b76b54d
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386
Change-Id: Ibfac12827098eac2ab2789c876a688da73d0cd87
2021-05-11 17:42:46 +00:00
b518701c91
lmkd: reroute atoms logging to AMS am: 6f11aff418
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: I244bd8606c3aefb426939ed65c9d54f3c784c1bc
2021-05-11 15:35:16 +00:00
a92b76b54d
lmkd: reroute atoms logging to AMS
...
- Added new lmkd message for clients to subscribe LMK_ASYNC_EVENT_STAT
- Added support to write kill & mem stats information via data socket
to be read & parsed on the AMS Java side for future logging to statsd
Bug: 184698933
Test: lmkd_unit_test - test check_for_oom tests lmkd message send to AMS
Test: statsd_testdrive 51 54 to inspect statsd logged atoms data
Change-Id: Id682a438c87b3e4503261d26461f6cee641d86c4
Merged-In: Id682a438c87b3e4503261d26461f6cee641d86c4
2021-05-11 00:00:56 +00:00
35804ede5f
lmkd: reroute atoms logging to AMS am: 6f11aff418 am: 56a9b111e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: I066f8050b7575351f637feedd34c3e3f2619760c
2021-05-10 23:54:27 +00:00
56a9b111e6
lmkd: reroute atoms logging to AMS am: 6f11aff418
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: I724e3fa85935a7986055cec4566f573b5da40c51
2021-05-10 23:48:17 +00:00
45fa6a05cb
lmkd: reroute atoms logging to AMS am: 6f11aff418
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: Ib2853c76fbdd6c427b657b79c03a5499fc64a43c
2021-05-10 23:46:10 +00:00
ac99efa3ad
lmkd: reroute atoms logging to AMS am: 6f11aff418
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337
Change-Id: I5938ed104f5cbb2dad158b8f79cd68624f9b9638
2021-05-10 23:45:57 +00:00
6f11aff418
lmkd: reroute atoms logging to AMS
...
- Added new lmkd message for clients to subscribe LMK_ASYNC_EVENT_STAT
- Added support to write kill & mem stats information via data socket
to be read & parsed on the AMS Java side for future logging to statsd
Bug: 184698933
Test: lmkd_unit_test - test check_for_oom tests lmkd message send to AMS
Test: statsd_testdrive 51 54 to inspect statsd logged atoms data
Change-Id: Id682a438c87b3e4503261d26461f6cee641d86c4
2021-05-03 21:47:22 +00:00
4de47eb096
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001 am: a8c2e1ece9
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: Ie627c0c28e256c329c64d10c8d672cddee7545cf
2021-04-30 03:04:38 +00:00
a8c2e1ece9
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: Icc800f4159c7875bb28988aae9bc4240e23ff015
2021-04-30 02:40:45 +00:00
9aede48461
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: Ib8be1ec661265fb33bd5420dcf2374fd153375db
2021-04-30 02:39:38 +00:00
5ceb07c9c7
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: I94a95b724ce88a97f94ea9e83a95cdff8f085e1f
2021-04-30 02:39:05 +00:00
1174827c4d
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: I5b38c0bbf186df02c2679a619fce20af02303b12
2021-04-30 02:38:43 +00:00
918648b001
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: Id8369cec0cbd39e4895e24eeffe824506fd3fb13
2021-04-30 01:40:22 +00:00
28164d3cc6
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: Id59a056468b053d2c28206959d8295937c9788e1
2021-04-30 00:59:58 +00:00
8aec07bbe0
lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656
Change-Id: I785575f6428b89bb59df690828fb60dc73f7d6e7
2021-04-30 00:35:22 +00:00
5263aa7800
lmkd: Do not treat RSS=0 as a sign of a process being dead
...
With kernel SPLIT_RSS_COUNTING feature it is possible for a valid
process to report RSS of 0 size when reading /proc/pid/statm. This
happens because split RSS accounting aggregates per-thread counters
asynchronously and depending on the timing of the read, reported
value can be inaccurate and occasionally be 0.
lmkd currently treats processes reporting RSS of 0 as dead and
removes them from the list of processes being tracked. This might
lead to a valid process becoming unkillable.
Change lmkd to stop treating RSS of 0 as a sign of a dead process.
Bug: 160199622
Test: set ro.lmk.kill_heaviest_task=true and hack kernel to report RSS=0
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ia311d2f98649c92d1a487657f94ea51f57813b73
2021-04-29 15:33:06 -07:00
f42759567e
lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06 am: c30dd665ba am: e67d7be9e4
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347
Change-Id: Id1b01af0d1c5b3655dae734a02dabc590b79ebce
2021-04-24 00:14:34 +00:00
d9cae1e040
lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06 am: c30dd665ba am: e67d7be9e4
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347
Change-Id: Iabc973097334994ffbbc6111a3fa8f36b298f478
2021-04-24 00:14:25 +00:00
5800a8474d
lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06 am: c30dd665ba am: e67d7be9e4
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347
Change-Id: I3ce5bfb7818f784db02ae6a4618edc3c2b8a4563
2021-04-24 00:11:49 +00:00
e67d7be9e4
lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06 am: c30dd665ba
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347
Change-Id: I0b430aeda1892a8916ac2538824496b0132c551e
2021-04-23 23:48:05 +00:00
c30dd665ba
lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347
Change-Id: I0ee304f6d85704ffdfe7868379a2dfe5ab28c22e
2021-04-23 23:25:43 +00:00
Xin Li
Suren Baghdasaryan
Vova Sharaienko