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

Commit 52eeb72b authored by Mohamad Mahmoud's avatar Mohamad Mahmoud Committed by Android (Google) Code Review
Browse files

Merge "Move dumpStackTraces to a helper"

parents 3cb35355 7123bec4

core/java/com/android/internal/os/anr/AnrLatencyTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -137,14 +137,14 @@ public class AnrLatencyTracker implements AutoCloseable { 
        close();

    }



    /** Records the start of ActivityManagerService#dumpStackTraces. */

    /** Records the start of StackTracesDumpHelper#dumpStackTraces. */

    public void dumpStackTracesStarted() {

        mDumpStackTracesStartUptime = getUptimeMillis();

        Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER,

                "dumpStackTraces()");

    }



    /** Records the end of ActivityManagerService#dumpStackTraces. */

    /** Records the end of StackTracesDumpHelper#dumpStackTraces. */

    public void dumpStackTracesEnded() {

        Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);

    }
@@ -328,7 +328,7 @@ public class AnrLatencyTracker implements AutoCloseable { 
        anrSkipped("appNotResponding");

    }



    /** Records a skipped ANR in ActivityManagerService#dumpStackTraces. */

    /** Records a skipped ANR in StackTracesDumpHelper#dumpStackTraces. */

    public void anrSkippedDumpStackTraces() {

        anrSkipped("dumpStackTraces");

    }

services/core/java/com/android/server/SystemServerInitThreadPool.java

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.util.Slog; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.Preconditions;

import com.android.server.am.ActivityManagerService;

import com.android.server.am.StackTracesDumpHelper;

import com.android.server.utils.TimingsTraceAndSlog;



import java.io.PrintWriter;
@@ -188,12 +188,12 @@ public final class SystemServerInitThreadPool implements Dumpable { 
    }



    /**

     * A helper function to call ActivityManagerService.dumpStackTraces().

     * A helper function to call StackTracesDumpHelper.dumpStackTraces().

     */

    private static void dumpStackTraces() {

        final ArrayList<Integer> pids = new ArrayList<>();

        pids.add(Process.myPid());

        ActivityManagerService.dumpStackTraces(pids,

        StackTracesDumpHelper.dumpStackTraces(pids,

                /* processCpuTracker= */null, /* lastPids= */null,

                CompletableFuture.completedFuture(Watchdog.getInterestingNativePids()),

                /* logExceptionCreatingFile= */null, /* subject= */null,

services/core/java/com/android/server/Watchdog.java

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.internal.os.ProcessCpuTracker; 
import com.android.internal.os.ZygoteConnectionConstants;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.am.ActivityManagerService;

import com.android.server.am.StackTracesDumpHelper;

import com.android.server.am.TraceErrorLogger;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.wm.SurfaceAnimationThread;
@@ -904,7 +905,7 @@ public class Watchdog implements Dumpable { 
        report.append(ResourcePressureUtil.currentPsiState());

        ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(false);

        StringWriter tracesFileException = new StringWriter();

        final File stack = ActivityManagerService.dumpStackTraces(

        final File stack = StackTracesDumpHelper.dumpStackTraces(

                pids, processCpuTracker, new SparseBooleanArray(),

                CompletableFuture.completedFuture(getInterestingNativePids()), tracesFileException,

                subject, criticalEvents, Runnable::run, /* latencyTracker= */null);

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −445

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/AppExitInfoTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ public final class AppExitInfoTracker { 
        final ArraySet<String> allFiles = new ArraySet();

        final File[] files = mProcExitStoreDir.listFiles((f) -> {

            final String name = f.getName();

            boolean trace = name.startsWith(ActivityManagerService.ANR_FILE_PREFIX)

            boolean trace = name.startsWith(StackTracesDumpHelper.ANR_FILE_PREFIX)

                    && name.endsWith(APP_TRACE_FILE_SUFFIX);

            if (trace) {

                allFiles.add(name);