Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef9522d authored by Colin Cross's avatar Colin Cross
Browse files

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
parent cf8d1c22

lmkd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

lmkd/lmkd.c

+2 −0
Original line number Diff line number Diff line
@@ -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) {