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

Commit 244f5d24 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Proc stats: include information about config. 

We now include in the app ops information about the device runtime
config that is relevant.  Currently this is the dalvik runtime in
use and the webview.  In checkin, this data looks like:

config,libdvm.so,webview

Change-Id: I85fd53418bd43595468f23ec8619e772fdaee7e1
parent 54e5f0eb

services/java/com/android/server/am/ProcessTracker.java

+88 −9
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.pm.IPackageManager; 
import android.os.Parcel;

import android.os.Parcel;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserHandle;

import android.text.format.DateFormat;

import android.text.format.DateFormat;

import android.util.ArrayMap;

import android.util.ArrayMap;
@@ -29,9 +30,11 @@ import android.util.AtomicFile; 
import android.util.Slog;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseArray;

import android.util.TimeUtils;

import android.util.TimeUtils;

import android.webkit.WebViewFactory;

import com.android.internal.os.BackgroundThread;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.server.ProcessMap;

import com.android.server.ProcessMap;

import dalvik.system.VMRuntime;





import java.io.File;

import java.io.File;

import java.io.FileDescriptor;

import java.io.FileDescriptor;
@@ -43,6 +46,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.Arrays;

import java.util.Collections;

import java.util.Collections;

import java.util.Comparator;

import java.util.Comparator;

import java.util.Objects;

import java.util.concurrent.locks.ReentrantLock;

import java.util.concurrent.locks.ReentrantLock;





public final class ProcessTracker {

public final class ProcessTracker {
@@ -689,12 +693,13 @@ public final class ProcessTracker { 




    static final class State {

    static final class State {

        // Current version of the parcel format.

        // Current version of the parcel format.

        private static final int PARCEL_VERSION = 6;

        private static final int PARCEL_VERSION = 7;

        // In-memory Parcel magic number, used to detect attempts to unmarshall bad data

        // In-memory Parcel magic number, used to detect attempts to unmarshall bad data

        private static final int MAGIC = 0x50535453;

        private static final int MAGIC = 0x50535453;





        static final int FLAG_COMPLETE = 1<<0;

        static final int FLAG_COMPLETE = 1<<0;

        static final int FLAG_SHUTDOWN = 1<<1;

        static final int FLAG_SHUTDOWN = 1<<1;

        static final int FLAG_SYSPROPS = 1<<2;





        final File mBaseDir;

        final File mBaseDir;

        final ProcessTracker mProcessTracker;

        final ProcessTracker mProcessTracker;
@@ -705,6 +710,8 @@ public final class ProcessTracker { 
        String mTimePeriodStartClockStr;

        String mTimePeriodStartClockStr;

        long mTimePeriodStartRealtime;

        long mTimePeriodStartRealtime;

        long mTimePeriodEndRealtime;

        long mTimePeriodEndRealtime;

        String mRuntime;

        String mWebView;

        boolean mRunning;

        boolean mRunning;

        int mFlags;

        int mFlags;
@@ -795,6 +802,28 @@ public final class ProcessTracker { 
            mStartTime = 0;

            mStartTime = 0;

            mReadError = null;

            mReadError = null;

            mFlags = 0;

            mFlags = 0;

            evaluateSystemProperties(true);

        }



        public boolean evaluateSystemProperties(boolean update) {

            boolean changed = false;

            String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib",

                    VMRuntime.getRuntime().vmLibrary());

            if (!Objects.equals(runtime, mRuntime)) {

                changed = true;

                if (update) {

                    mRuntime = runtime;

                }

            }

            String webview = SystemProperties.getBoolean(

                    WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY, false) ? "chromeview" : "webview";

            if (!Objects.equals(webview, mWebView)) {

                changed = true;

                if (update) {

                    mWebView = webview;

                }

            }

            return changed;

        }

        }





        private void buildTimePeriodStartClockStr() {

        private void buildTimePeriodStartClockStr() {
@@ -963,6 +992,8 @@ public final class ProcessTracker { 
            out.writeLong(mTimePeriodStartClock);

            out.writeLong(mTimePeriodStartClock);

            out.writeLong(mTimePeriodStartRealtime);

            out.writeLong(mTimePeriodStartRealtime);

            out.writeLong(mTimePeriodEndRealtime);

            out.writeLong(mTimePeriodEndRealtime);

            out.writeString(mRuntime);

            out.writeString(mWebView);

            out.writeInt(mFlags);

            out.writeInt(mFlags);





            out.writeInt(mLongs.size());

            out.writeInt(mLongs.size());
@@ -1052,7 +1083,9 @@ public final class ProcessTracker { 
            if (!readCheckedInt(in, MAGIC, "magic number")) {

            if (!readCheckedInt(in, MAGIC, "magic number")) {

                return;

                return;

            }

            }

            if (!readCheckedInt(in, PARCEL_VERSION, "version")) {

            int version = in.readInt();

            if (version != PARCEL_VERSION && version != 6) {

                mReadError = "bad version: " + version;

                return;

                return;

            }

            }

            if (!readCheckedInt(in, STATE_COUNT, "state count")) {

            if (!readCheckedInt(in, STATE_COUNT, "state count")) {
@@ -1072,6 +1105,10 @@ public final class ProcessTracker { 
            buildTimePeriodStartClockStr();

            buildTimePeriodStartClockStr();

            mTimePeriodStartRealtime = in.readLong();

            mTimePeriodStartRealtime = in.readLong();

            mTimePeriodEndRealtime = in.readLong();

            mTimePeriodEndRealtime = in.readLong();

            if (version ==  PARCEL_VERSION) {

                mRuntime = in.readString();

                mWebView = in.readString();

            }

            mFlags = in.readInt();

            mFlags = in.readInt();





            final int NLONGS = in.readInt();

            final int NLONGS = in.readInt();
@@ -1529,9 +1566,26 @@ public final class ProcessTracker { 
            TimeUtils.formatDuration(

            TimeUtils.formatDuration(

                    (mRunning ? SystemClock.elapsedRealtime() : mTimePeriodEndRealtime)

                    (mRunning ? SystemClock.elapsedRealtime() : mTimePeriodEndRealtime)

                            - mTimePeriodStartRealtime, pw);

                            - mTimePeriodStartRealtime, pw);

            if ((mFlags&FLAG_COMPLETE) != 0) pw.print(" (complete)");

            boolean partial = true;

            else if ((mFlags&FLAG_SHUTDOWN) != 0) pw.print(" (shutdown)");

            if ((mFlags&FLAG_SHUTDOWN) != 0) {

            else pw.print(" (partial)");

                pw.print(" (shutdown)");

                partial = false;

            }

            if ((mFlags&FLAG_SYSPROPS) != 0) {

                pw.print(" (sysprops)");

                partial = false;

            }

            if ((mFlags&FLAG_COMPLETE) != 0) {

                pw.print(" (complete)");

                partial = false;

            }

            if (partial) {

                pw.print(" (partial)");

            }

            pw.print(' ');

            pw.print(mRuntime);

            pw.print(' ');

            pw.print(mWebView);

            pw.println();

            pw.println();

        }

        }
@@ -1611,10 +1665,24 @@ public final class ProcessTracker { 
            pw.print("period,"); pw.print(mTimePeriodStartClockStr);

            pw.print("period,"); pw.print(mTimePeriodStartClockStr);

            pw.print(","); pw.print(mTimePeriodStartRealtime); pw.print(",");

            pw.print(","); pw.print(mTimePeriodStartRealtime); pw.print(",");

            pw.print(mRunning ? SystemClock.elapsedRealtime() : mTimePeriodEndRealtime);

            pw.print(mRunning ? SystemClock.elapsedRealtime() : mTimePeriodEndRealtime);

            if ((mFlags&FLAG_COMPLETE) != 0) pw.print(",complete");

            boolean partial = true;

            else if ((mFlags&FLAG_SHUTDOWN) != 0) pw.print(",shutdown");

            if ((mFlags&FLAG_SHUTDOWN) != 0) {

            else pw.print(",partial");

                pw.print(",shutdown");

                partial = false;

            }

            if ((mFlags&FLAG_SYSPROPS) != 0) {

                pw.print(",sysprops");

                partial = false;

            }

            if ((mFlags&FLAG_COMPLETE) != 0) {

                pw.print(",complete");

                partial = false;

            }

            if (partial) {

                pw.print(",partial");

            }

            pw.println();

            pw.println();

            pw.print("config,"); pw.print(mRuntime); pw.print(','); pw.println(mWebView);

            for (int ip=0; ip<pkgMap.size(); ip++) {

            for (int ip=0; ip<pkgMap.size(); ip++) {

                String pkgName = pkgMap.keyAt(ip);

                String pkgName = pkgMap.keyAt(ip);

                if (reqPackage != null && !reqPackage.equals(pkgName)) {

                if (reqPackage != null && !reqPackage.equals(pkgName)) {
@@ -1726,6 +1794,17 @@ public final class ProcessTracker { 
        mBaseDir.mkdirs();

        mBaseDir.mkdirs();

        mState = new State(mBaseDir, this);

        mState = new State(mBaseDir, this);

        mState.mRunning = true;

        mState.mRunning = true;

        SystemProperties.addChangeCallback(new Runnable() {

            @Override public void run() {

                synchronized (mLock) {

                    if (mState.evaluateSystemProperties(false)) {

                        mState.mFlags |= State.FLAG_SYSPROPS;

                        mState.writeStateLocked(true, true);

                        mState.evaluateSystemProperties(true);

                    }

                }

            }

        });

    }

    }





    public ProcessState getProcessStateLocked(String packageName, int uid, String processName) {

    public ProcessState getProcessStateLocked(String packageName, int uid, String processName) {