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

Commit f9254241 authored by zhangjianqiu's avatar zhangjianqiu Committed by Bruno Martins
Browse files

Zygote: Fix an issue when empty the usap pool. 



When empty the usap pool, the usap processes may be blocked by
usapPoolSocket.accept(), which cause the usap process fail to kill
immediately. So we can move the position of blockSigTerm after
usapPoolsSocket.accept() and delele the old blockSigTerm in the while
loop.

Test: manual test.
1.setprop persist.device_config.runtime_native.usap_pool_enabled true.
After 1 min, trigger fill usap pools.
2.setprop persist.device_config.runtime_native.usap_pool_enabled false.
After 1 min, trigger empty usap pools.
3.repeat step 1.

Signed-off-by: default avatarzhangjianqiu <zhangjianqiu@oppo.com>
Change-Id: I657940b30f71cdc717c673be6d70738e61e2bb68
parent 10d44bf3

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

+6 −4
Original line number Diff line number Diff line
@@ -724,9 +724,6 @@ public final class Zygote { 
        DataOutputStream usapOutputStream = null;

        ZygoteArguments args = null;



        // Block SIGTERM so we won't be killed if the Zygote flushes the USAP pool.

        blockSigTerm();



        LocalSocket sessionSocket = null;

        if (argBuffer == null) {

            // Read arguments from usapPoolSocket instead.
@@ -742,6 +739,10 @@ public final class Zygote { 
                ZygoteCommandBuffer tmpArgBuffer = null;

                try {

                    sessionSocket = usapPoolSocket.accept();

                    // Block SIGTERM so we won't be killed if the Zygote flushes the USAP pool.

                    // This is safe from a race condition because the pool is only flushed after

                    // the SystemServer changes its internal state to stop using the USAP pool.

                    blockSigTerm();



                    usapOutputStream =

                            new DataOutputStream(sessionSocket.getOutputStream());
@@ -759,9 +760,10 @@ public final class Zygote { 
                unblockSigTerm();

                IoUtils.closeQuietly(sessionSocket);

                IoUtils.closeQuietly(tmpArgBuffer);

                blockSigTerm();

            }

        } else {

            // Block SIGTERM so we won't be killed if the Zygote flushes the USAP pool.

            blockSigTerm();

            try {

                args = ZygoteArguments.getInstance(argBuffer);

            } catch (Exception ex) {