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

Remove kill_one_process tracepoint from lmkd am: b9d0592bba am: f8727745f9 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2175442

Change-Id: I267d82e4358bce89aa601fb9f39eb712dce3d9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioannis Ilkos 2022-08-08 18:46:27 +00:00 committed by Automerger Merge Worker
parent 158b031098 f8727745f9
commit 7324be6c63
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lmkd.cpp
View File

@ -66,19 +66,17 @@
#define ATRACE_TAG ATRACE_TAG_ALWAYS #define ATRACE_TAG ATRACE_TAG_ALWAYS
#include <cutils/trace.h> #include <cutils/trace.h>
static inline void trace_kill_start(int pid, const char *desc) { static inline void trace_kill_start(const char *desc) {
ATRACE_INT("kill_one_process", pid);
ATRACE_BEGIN(desc); ATRACE_BEGIN(desc);
} }
static inline void trace_kill_end() { static inline void trace_kill_end() {
ATRACE_END(); ATRACE_END();
ATRACE_INT("kill_one_process", 0);
} }
#else /* LMKD_TRACE_KILLS */ #else /* LMKD_TRACE_KILLS */
static inline void trace_kill_start(int, const char *) {} static inline void trace_kill_start(const char *) {}
static inline void trace_kill_end() {} static inline void trace_kill_end() {}
#endif /* LMKD_TRACE_KILLS */ #endif /* LMKD_TRACE_KILLS */
@ -2337,7 +2335,7 @@ static int kill_one_process(struct proc* procp, int min_oom_score, struct kill_i
return result; return result;
} }
trace_kill_start(pid, desc); trace_kill_start(desc);
start_wait_for_proc_kill(pidfd < 0 ? pid : pidfd); start_wait_for_proc_kill(pidfd < 0 ? pid : pidfd);
kill_result = reaper.kill({ pidfd, pid, uid }, false); kill_result = reaper.kill({ pidfd, pid, uid }, false);