Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the reset of boosted zygote thread priority."

Browse Source 
am: 83aceea07d

Change-Id: I6ebd30a631ae10ada65b3279ec66c41d3f50fb1f
This commit is contained in:
Hiroshi Yamauchi
2017-03-13 17:42:50 +00:00
committed by android-build-merger
parent cc935f5e6d 83aceea07d
commit 55310df6bc
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/os/Zygote.java
View File

@@ -100,6 +100,8 @@ public final class Zygote {
int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose, int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose,
int[] fdsToIgnore, String instructionSet, String appDataDir) { int[] fdsToIgnore, String instructionSet, String appDataDir) {
VM_HOOKS.preFork(); VM_HOOKS.preFork();
// Resets nice priority for zygote process.
resetNicePriority();
int pid = nativeForkAndSpecialize( int pid = nativeForkAndSpecialize(
uid, gid, gids, debugFlags, rlimits, mountExternal, seInfo, niceName, fdsToClose, uid, gid, gids, debugFlags, rlimits, mountExternal, seInfo, niceName, fdsToClose,
fdsToIgnore, instructionSet, appDataDir); fdsToIgnore, instructionSet, appDataDir);
@@ -144,6 +146,8 @@ public final class Zygote {
public static int forkSystemServer(int uid, int gid, int[] gids, int debugFlags, public static int forkSystemServer(int uid, int gid, int[] gids, int debugFlags,
int[][] rlimits, long permittedCapabilities, long effectiveCapabilities) { int[][] rlimits, long permittedCapabilities, long effectiveCapabilities) {
VM_HOOKS.preFork(); VM_HOOKS.preFork();
// Resets nice priority for zygote process.
resetNicePriority();
int pid = nativeForkSystemServer( int pid = nativeForkSystemServer(
uid, gid, gids, debugFlags, rlimits, permittedCapabilities, effectiveCapabilities); uid, gid, gids, debugFlags, rlimits, permittedCapabilities, effectiveCapabilities);
// Enable tracing as soon as we enter the system_server. // Enable tracing as soon as we enter the system_server.
@@ -173,6 +177,14 @@ public final class Zygote {
VM_HOOKS.postForkChild(debugFlags, isSystemServer, instructionSet); VM_HOOKS.postForkChild(debugFlags, isSystemServer, instructionSet);
} }
/**
* Resets the calling thread priority to the default value (Thread.NORM_PRIORITY
* or nice value 0). This updates both the priority value in java.lang.Thread and
* the nice value (setpriority).
*/
static void resetNicePriority() {
Thread.currentThread().setPriority(Thread.NORM_PRIORITY);
}
/** /**
* Executes "/system/bin/sh -c <command>" using the exec() system call. * Executes "/system/bin/sh -c <command>" using the exec() system call.

20
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -155,24 +155,6 @@ static void SetSigChldHandler() {
} }
} }
// Resets nice priority for zygote process. Zygote priority can be set
// to high value during boot phase to speed it up. We want to ensure
// zygote is running at normal priority before childs are forked from it.
//
// This ends up being called repeatedly before each fork(), but there's
// no real harm in that.
static void ResetNicePriority(JNIEnv* env) {
errno = 0;
int prio = getpriority(PRIO_PROCESS, 0);
if (prio == -1 && errno != 0) {
ALOGW("getpriority failed: %s\n", strerror(errno));
}
if (prio != 0 && setpriority(PRIO_PROCESS, 0, 0) != 0) {
ALOGE("setpriority(%d, 0, 0) failed: %s", PRIO_PROCESS, strerror(errno));
RuntimeAbort(env, __LINE__, "setpriority failed");
}
}
// Sets the SIGCHLD handler back to default behavior in zygote children. // Sets the SIGCHLD handler back to default behavior in zygote children.
static void UnsetSigChldHandler() { static void UnsetSigChldHandler() {
struct sigaction sa; struct sigaction sa;
@@ -526,8 +508,6 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
RuntimeAbort(env, __LINE__, "Unable to restat file descriptor table."); RuntimeAbort(env, __LINE__, "Unable to restat file descriptor table.");
} }
ResetNicePriority(env);
pid_t pid = fork(); pid_t pid = fork();
if (pid == 0) { if (pid == 0) {