lmkd: use libprocessgroup to kill forked processes
After sending sigkill to the main process, also call into libprocessgroup to kill any processes that were forked. Bug: 15313911 Change-Id: I05577c6f5b70800ce0a01f480c8870c2c601afda
This commit is contained in:
parent
748d2185d3
commit
4e9100c14d
|
|
@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_SRC_FILES := lmkd.c
|
LOCAL_SRC_FILES := lmkd.c
|
||||||
LOCAL_SHARED_LIBRARIES := libcutils liblog libm libc
|
LOCAL_SHARED_LIBRARIES := libcutils liblog libm libc libprocessgroup
|
||||||
LOCAL_CFLAGS := -Werror
|
LOCAL_CFLAGS := -Werror
|
||||||
|
|
||||||
LOCAL_MODULE := lmkd
|
LOCAL_MODULE := lmkd
|
||||||
|
|
|
||||||
2
lmkd.c
2
lmkd.c
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
#include <cutils/sockets.h>
|
#include <cutils/sockets.h>
|
||||||
#include <log/log.h>
|
#include <log/log.h>
|
||||||
|
#include <processgroup/processgroup.h>
|
||||||
|
|
||||||
#ifndef __unused
|
#ifndef __unused
|
||||||
#define __unused __attribute__((__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_file * page_k, minfree * page_k, min_score_adj,
|
||||||
other_free * page_k, other_free >= 0 ? "above" : "below");
|
other_free * page_k, other_free >= 0 ? "above" : "below");
|
||||||
r = kill(pid, SIGKILL);
|
r = kill(pid, SIGKILL);
|
||||||
|
killProcessGroup(uid, pid, SIGKILL);
|
||||||
pid_remove(pid);
|
pid_remove(pid);
|
||||||
|
|
||||||
if (r) {
|
if (r) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue