PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adapt to procstats classes which moved." into nyc-dev

Browse Source 
am: 25b5d98

* commit '25b5d98a74cb09d02b8149eb1cb60803c4562185':
  Adapt to procstats classes which moved.
This commit is contained in:
Joe Onorato
2016-03-28 22:33:36 +00:00
committed by android-build-merger
parent 4065586a29 25b5d98a74
commit 3873f8e7cc
5 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/settings/applications/ProcStatsData.java
View File

@@ -28,11 +28,14 @@ import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.app.IProcessStats;
import com.android.internal.app.ProcessMap; import com.android.internal.app.ProcessMap;
import com.android.internal.app.ProcessStats; import com.android.internal.app.procstats.DumpUtils;
import com.android.internal.app.ProcessStats.ProcessDataCollection; import com.android.internal.app.procstats.IProcessStats;
import com.android.internal.app.ProcessStats.TotalMemoryUseCollection; import com.android.internal.app.procstats.ProcessState;
import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.app.procstats.ProcessStats.ProcessDataCollection;
import com.android.internal.app.procstats.ProcessStats.TotalMemoryUseCollection;
import com.android.internal.app.procstats.ServiceState;
import com.android.internal.util.MemInfoReader; import com.android.internal.util.MemInfoReader;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -142,7 +145,7 @@ public class ProcStatsData {
long now = SystemClock.uptimeMillis(); long now = SystemClock.uptimeMillis();
memTotalTime = ProcessStats.dumpSingleTime(null, null, mStats.mMemFactorDurations, memTotalTime = DumpUtils.dumpSingleTime(null, null, mStats.mMemFactorDurations,
mStats.mMemFactor, mStats.mStartTime, now); mStats.mMemFactor, mStats.mStartTime, now);
ProcessStats.TotalMemoryUseCollection totalMem = new ProcessStats.TotalMemoryUseCollection( ProcessStats.TotalMemoryUseCollection totalMem = new ProcessStats.TotalMemoryUseCollection(
@@ -274,26 +277,26 @@ public class ProcStatsData {
for (int iv = 0; iv < vpkgs.size(); iv++) { for (int iv = 0; iv < vpkgs.size(); iv++) {
final ProcessStats.PackageState st = vpkgs.valueAt(iv); final ProcessStats.PackageState st = vpkgs.valueAt(iv);
for (int iproc = 0; iproc < st.mProcesses.size(); iproc++) { for (int iproc = 0; iproc < st.mProcesses.size(); iproc++) {
final ProcessStats.ProcessState pkgProc = st.mProcesses.valueAt(iproc); final ProcessState pkgProc = st.mProcesses.valueAt(iproc);
final ProcessStats.ProcessState proc = mStats.mProcesses.get(pkgProc.mName, final ProcessState proc = mStats.mProcesses.get(pkgProc.getName(),
pkgProc.mUid); pkgProc.getUid());
if (proc == null) { if (proc == null) {
Log.w(TAG, "No process found for pkg " + st.mPackageName Log.w(TAG, "No process found for pkg " + st.mPackageName
+ "/" + st.mUid + " proc name " + pkgProc.mName); + "/" + st.mUid + " proc name " + pkgProc.getName());
continue; continue;
} }
ProcStatsEntry ent = entriesMap.get(proc.mName, proc.mUid); ProcStatsEntry ent = entriesMap.get(proc.getName(), proc.getUid());
if (ent == null) { if (ent == null) {
ent = new ProcStatsEntry(proc, st.mPackageName, bgTotals, runTotals, ent = new ProcStatsEntry(proc, st.mPackageName, bgTotals, runTotals,
mUseUss); mUseUss);
if (ent.mRunWeight > 0) { if (ent.mRunWeight > 0) {
if (DEBUG) Log.d(TAG, "Adding proc " + proc.mName + "/" if (DEBUG) Log.d(TAG, "Adding proc " + proc.getName() + "/"
+ proc.mUid + ": time=" + proc.getUid() + ": time="
+ ProcessStatsUi.makeDuration(ent.mRunDuration) + " (" + ProcessStatsUi.makeDuration(ent.mRunDuration) + " ("
+ ((((double) ent.mRunDuration) / memTotalTime) * 100) + ((((double) ent.mRunDuration) / memTotalTime) * 100)
+ "%)" + "%)"
+ " pss=" + ent.mAvgRunMem); + " pss=" + ent.mAvgRunMem);
entriesMap.put(proc.mName, proc.mUid, ent); entriesMap.put(proc.getName(), proc.getUid(), ent);
procEntries.add(ent); procEntries.add(ent);
} }
} else { } else {
@@ -315,18 +318,18 @@ public class ProcStatsData {
for (int iv = 0; iv < vpkgs.size(); iv++) { for (int iv = 0; iv < vpkgs.size(); iv++) {
ProcessStats.PackageState ps = vpkgs.valueAt(iv); ProcessStats.PackageState ps = vpkgs.valueAt(iv);
for (int is = 0, NS = ps.mServices.size(); is < NS; is++) { for (int is = 0, NS = ps.mServices.size(); is < NS; is++) {
ProcessStats.ServiceState ss = ps.mServices.valueAt(is); ServiceState ss = ps.mServices.valueAt(is);
if (ss.mProcessName != null) { if (ss.getProcessName() != null) {
ProcStatsEntry ent = entriesMap.get(ss.mProcessName, ProcStatsEntry ent = entriesMap.get(ss.getProcessName(),
uids.keyAt(iu)); uids.keyAt(iu));
if (ent != null) { if (ent != null) {
if (DEBUG) Log.d(TAG, "Adding service " + ps.mPackageName if (DEBUG) Log.d(TAG, "Adding service " + ps.mPackageName
+ "/" + ss.mName + "/" + uids.keyAt(iu) + " to proc " + "/" + ss.getName() + "/" + uids.keyAt(iu)
+ ss.mProcessName); + " to proc " + ss.getProcessName());
ent.addService(ss); ent.addService(ss);
} else { } else {
Log.w(TAG, "No process " + ss.mProcessName + "/" + uids.keyAt(iu) Log.w(TAG, "No process " + ss.getProcessName() + "/"
+ " for service " + ss.mName); + uids.keyAt(iu) + " for service " + ss.getName());
} }
} }
} }

39
src/com/android/settings/applications/ProcStatsEntry.java
View File

@@ -24,7 +24,9 @@ import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.app.ProcessStats; import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.app.procstats.ProcessState;
import com.android.internal.app.procstats.ServiceState;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -52,14 +54,14 @@ public final class ProcStatsEntry implements Parcelable {
ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<String, ArrayList<Service>>(1); ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<String, ArrayList<Service>>(1);
public ProcStatsEntry(ProcessStats.ProcessState proc, String packageName, public ProcStatsEntry(ProcessState proc, String packageName,
ProcessStats.ProcessDataCollection tmpBgTotals, ProcessStats.ProcessDataCollection tmpBgTotals,
ProcessStats.ProcessDataCollection tmpRunTotals, boolean useUss) { ProcessStats.ProcessDataCollection tmpRunTotals, boolean useUss) {
ProcessStats.computeProcessData(proc, tmpBgTotals, 0); proc.computeProcessData(tmpBgTotals, 0);
ProcessStats.computeProcessData(proc, tmpRunTotals, 0); proc.computeProcessData(tmpRunTotals, 0);
mPackage = proc.mPackage; mPackage = proc.getPackage();
mUid = proc.mUid; mUid = proc.getUid();
mName = proc.mName; mName = proc.getName();
mPackages.add(packageName); mPackages.add(packageName);
mBgDuration = tmpBgTotals.totalTime; mBgDuration = tmpBgTotals.totalTime;
mAvgBgMem = useUss ? tmpBgTotals.avgUss : tmpBgTotals.avgPss; mAvgBgMem = useUss ? tmpBgTotals.avgUss : tmpBgTotals.avgPss;
@@ -69,7 +71,7 @@ public final class ProcStatsEntry implements Parcelable {
mAvgRunMem = useUss ? tmpRunTotals.avgUss : tmpRunTotals.avgPss; mAvgRunMem = useUss ? tmpRunTotals.avgUss : tmpRunTotals.avgPss;
mMaxRunMem = useUss ? tmpRunTotals.maxUss : tmpRunTotals.maxPss; mMaxRunMem = useUss ? tmpRunTotals.maxUss : tmpRunTotals.maxPss;
mRunWeight = mAvgRunMem * (double) mRunDuration; mRunWeight = mAvgRunMem * (double) mRunDuration;
if (DEBUG) Log.d(TAG, "New proc entry " + proc.mName + ": dur=" + mBgDuration if (DEBUG) Log.d(TAG, "New proc entry " + proc.getName() + ": dur=" + mBgDuration
+ " avgpss=" + mAvgBgMem + " weight=" + mBgWeight); + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
} }
@@ -149,7 +151,7 @@ public final class ProcStatsEntry implements Parcelable {
+ mUid + " in process " + mName); + mUid + " in process " + mName);
continue; continue;
} }
ProcessStats.ProcessState pkgProc = pkgState.mProcesses.get(mName); ProcessState pkgProc = pkgState.mProcesses.get(mName);
if (pkgProc == null) { if (pkgProc == null) {
Log.w(TAG, "No process " + mName + " found in package state " Log.w(TAG, "No process " + mName + " found in package state "
+ mPackages.get(ipkg) + "/" + mUid); + mPackages.get(ipkg) + "/" + mUid);
@@ -252,11 +254,11 @@ public final class ProcStatsEntry implements Parcelable {
} }
} }
public void addService(ProcessStats.ServiceState svc) { public void addService(ServiceState svc) {
ArrayList<Service> services = mServices.get(svc.mPackage); ArrayList<Service> services = mServices.get(svc.getPackage());
if (services == null) { if (services == null) {
services = new ArrayList<Service>(); services = new ArrayList<Service>();
mServices.put(svc.mPackage, services); mServices.put(svc.getPackage(), services);
} }
services.add(new Service(svc)); services.add(new Service(svc));
} }
@@ -306,13 +308,12 @@ public final class ProcStatsEntry implements Parcelable {
final String mProcess; final String mProcess;
final long mDuration; final long mDuration;
public Service(ProcessStats.ServiceState service) { public Service(ServiceState service) {
mPackage = service.mPackage; mPackage = service.getPackage();
mName = service.mName; mName = service.getName();
mProcess = service.mProcessName; mProcess = service.getProcessName();
mDuration = ProcessStats.dumpSingleServiceTime(null, null, service, mDuration = service.dumpTime(null, null,
ProcessStats.ServiceState.SERVICE_RUN, ServiceState.SERVICE_RUN, ProcessStats.STATE_NOTHING, 0, 0);
ProcessStats.STATE_NOTHING, 0, 0);
} }
public Service(Parcel in) { public Service(Parcel in) {

2
src/com/android/settings/applications/ProcessStatsBase.java
View File

@@ -23,7 +23,7 @@ import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Spinner; import android.widget.Spinner;
import com.android.internal.app.ProcessStats; import com.android.internal.app.procstats.ProcessStats;
import com.android.settings.AppHeader; import com.android.settings.AppHeader;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;

2
src/com/android/settings/applications/ProcessStatsMemDetail.java
View File

@@ -24,7 +24,7 @@ import android.view.ViewGroup;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.app.ProcessStats; import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.InstrumentedFragment; import com.android.settings.InstrumentedFragment;
import com.android.settings.R; import com.android.settings.R;

2
src/com/android/settings/applications/ProcessStatsUi.java
View File

@@ -27,7 +27,7 @@ import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import com.android.internal.app.ProcessStats; import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;