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

Commit 77aca50b authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Add phenotype property for profiling system server 

Added the property profilesystemserver in the RUNTIME_NATIVE_BOOT
namespace. This property is overrides the system one if it is
present.

Bug: 139883463
Test: set the property manually and verify that system server is started
Test: with profiling

(cherry picked from commit 7b31c74d)

Merged-In: Ifd69530e52a717a381b3f91b15a74329614906f2
Change-Id: I00594949b845a75152c7ab3c94aa84a55b072776
parent 036ea39d

core/java/com/android/internal/os/ZygoteInit.java

+15 −6
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.os.ZygoteProcess;

import android.os.storage.StorageManager;

import android.provider.DeviceConfig;

import android.security.keystore.AndroidKeyStoreProvider;

import android.system.ErrnoException;

import android.system.Os;
@@ -459,6 +460,16 @@ public class ZygoteInit { 
        ZygoteHooks.gcAndFinalize();

    }



    private static boolean profileSystemServer() {

        boolean defaultValue = SystemProperties.getBoolean("dalvik.vm.profilesystemserver",

                /*default=*/ false);

        // Can't use DeviceConfig since it's not initialized at this point.

        return SystemProperties.getBoolean(

                "persist.device_config." + DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT

                        + ".profilesystemserver",

                defaultValue);

    }



    /**

     * Finish remaining work for the newly forked system server process.

     */
@@ -481,10 +492,9 @@ public class ZygoteInit { 
            }

            // Capturing profiles is only supported for debug or eng builds since selinux normally

            // prevents it.

            boolean profileSystemServer = SystemProperties.getBoolean(

                    "dalvik.vm.profilesystemserver", false);

            if (profileSystemServer && (Build.IS_USERDEBUG || Build.IS_ENG)) {

            if (profileSystemServer() && (Build.IS_USERDEBUG || Build.IS_ENG)) {

                try {

                    Log.d(TAG, "Preparing system server profile");

                    prepareSystemServerProfile(systemServerClasspath);

                } catch (Exception e) {

                    Log.wtf(TAG, "Failed to set up system server profile", e);
@@ -755,9 +765,8 @@ public class ZygoteInit { 
            Zygote.applyDebuggerSystemProperty(parsedArgs);

            Zygote.applyInvokeWithSystemProperty(parsedArgs);



            boolean profileSystemServer = SystemProperties.getBoolean(

                    "dalvik.vm.profilesystemserver", false);

            if (profileSystemServer) {

            if (profileSystemServer()) {



                parsedArgs.mRuntimeFlags |= Zygote.PROFILE_SYSTEM_SERVER;

            }