Merge "lmkd: use libprocessgroup to kill forked processes"

This commit is contained in:
Colin Cross 2014-07-10 19:51:35 +00:00 committed by Android (Google) Code Review
commit 420f0a2567
2 changed files with 3 additions and 1 deletions

View File

@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := lmkd.c
LOCAL_SHARED_LIBRARIES := libcutils liblog libm libc
LOCAL_SHARED_LIBRARIES := libcutils liblog libm libc libprocessgroup
LOCAL_CFLAGS := -Werror
LOCAL_MODULE := lmkd

View File

@ -32,6 +32,7 @@
#include <cutils/sockets.h>
#include <log/log.h>
#include <processgroup/processgroup.h>
#ifndef __unused
#define __unused __attribute__((__unused__))
@ -591,6 +592,7 @@ static void mp_event(uint32_t events __unused) {
other_file * page_k, minfree * page_k, min_score_adj,
other_free * page_k, other_free >= 0 ? "above" : "below");
r = kill(pid, SIGKILL);
killProcessGroup(uid, pid, SIGKILL);
pid_remove(pid);
if (r) {