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

lmkd: enable ro.lmk.kill_timeout_ms to be used with kill notifications 

Allow lmkd to stop waiting for a kill notification if a kill takes longer
than ro.lmk.kill_timeout_ms.

Bug: 147315292
Test: lmkd_unit_test with ro.lmk.kill_timeout_ms set to 100
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: Ia3eed3448fd6928a5e634c2737044722048b3578
Change-Id: Ia3eed3448fd6928a5e634c2737044722048b3578
This commit is contained in:
Suren Baghdasaryan 2020-04-28 16:02:13 -07:00
parent 3f84a211e5
commit c7e51b7b2a
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lmkd.cpp
View File

@ -2273,21 +2273,23 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
bool cut_thrashing_limit = false; bool cut_thrashing_limit = false;
int min_score_adj = 0; int min_score_adj = 0;
/* Skip while still killing a process */
if (is_kill_pending()) {
goto no_kill;
}
/*
* Process is dead, stop waiting. This has no effect if pidfds are supported and
* death notification already caused waiting to stop.
*/
stop_wait_for_proc_kill(true);
if (clock_gettime(CLOCK_MONOTONIC_COARSE, &curr_tm) != 0) { if (clock_gettime(CLOCK_MONOTONIC_COARSE, &curr_tm) != 0) {
ALOGE("Failed to get current time"); ALOGE("Failed to get current time");
return; return;
} }
bool kill_pending = is_kill_pending();
if (kill_pending &&
(kill_timeout_ms == 0 || get_time_diff_ms(&last_kill_tm, &curr_tm) < kill_timeout_ms)) {
/* Skip while still killing a process */
goto no_kill;
}
/*
* Process is dead or kill timeout is over, stop waiting. This has no effect if pidfds are
* supported and death notification already caused waiting to stop.
*/
stop_wait_for_proc_kill(!kill_pending);
if (vmstat_parse(&vs) < 0) { if (vmstat_parse(&vs) < 0) {
ALOGE("Failed to parse vmstat!"); ALOGE("Failed to parse vmstat!");
return; return;
@ -2985,6 +2987,15 @@ static int init(void) {
return 0; return 0;
} }
static bool polling_paused(struct polling_params *poll_params) {
return poll_params->paused_handler != NULL;
}
static void resume_polling(struct polling_params *poll_params, struct timespec curr_tm) {
poll_params->poll_start_tm = curr_tm;
poll_params->poll_handler = poll_params->paused_handler;
}
static void call_handler(struct event_handler_info* handler_info, static void call_handler(struct event_handler_info* handler_info,
struct polling_params *poll_params, uint32_t events) { struct polling_params *poll_params, uint32_t events) {
struct timespec curr_tm; struct timespec curr_tm;
@ -3011,8 +3022,7 @@ static void call_handler(struct event_handler_info* handler_info,
poll_params->poll_handler = NULL; poll_params->poll_handler = NULL;
break; break;
case POLLING_RESUME: case POLLING_RESUME:
poll_params->poll_start_tm = curr_tm; resume_polling(poll_params, curr_tm);
poll_params->poll_handler = poll_params->paused_handler;
break; break;
case POLLING_DO_NOT_CHANGE: case POLLING_DO_NOT_CHANGE:
if (get_time_diff_ms(&poll_params->poll_start_tm, &curr_tm) > PSI_WINDOW_SIZE_MS) { if (get_time_diff_ms(&poll_params->poll_start_tm, &curr_tm) > PSI_WINDOW_SIZE_MS) {
@ -3068,10 +3078,25 @@ static void mainloop(void) {
if (poll_now) { if (poll_now) {
call_handler(poll_params.poll_handler, &poll_params, 0); call_handler(poll_params.poll_handler, &poll_params, 0);
} }
} else {
if (kill_timeout_ms && is_waiting_for_kill()) {
clock_gettime(CLOCK_MONOTONIC_COARSE, &curr_tm);
delay = kill_timeout_ms - get_time_diff_ms(&last_kill_tm, &curr_tm);
/* Wait for pidfds notification or kill timeout to expire */
nevents = (delay > 0) ? epoll_wait(epollfd, events, maxevents, delay) : 0;
if (nevents == 0) {
/* Kill notification timed out */
stop_wait_for_proc_kill(false);
if (polling_paused(&poll_params)) {
clock_gettime(CLOCK_MONOTONIC_COARSE, &curr_tm);
resume_polling(&poll_params, curr_tm);
}
}
} else { } else {
/* Wait for events with no timeout */ /* Wait for events with no timeout */
nevents = epoll_wait(epollfd, events, maxevents, -1); nevents = epoll_wait(epollfd, events, maxevents, -1);
} }
}
if (nevents == -1) { if (nevents == -1) {
if (errno == EINTR) if (errno == EINTR)