Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab75e am: 5036d1ea1d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717283

Change-Id: I484499fea4920a264619809e8134ae551a5475b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lee Shombert
2022-06-07 23:17:47 +00:00
committed by Automerger Merge Worker
parent d7c1627f1f 5036d1ea1d
commit 5310894b4a
1 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
core/java/android/app/PropertyInvalidatedCache.java
View File

@@ -33,6 +33,7 @@ import com.android.internal.util.FastPrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -1444,7 +1445,6 @@ public class PropertyInvalidatedCache<Query, Result> {
mCache.size(), mMaxEntries, mHighWaterMark, mMissOverflow));
pw.println(TextUtils.formatSimple(" Enabled: %s", mDisabled ? "false" : "true"));
pw.println("");
pw.flush();
// No specific cache was requested. This is the default, and no details
// should be dumped.
@@ -1463,7 +1463,6 @@ public class PropertyInvalidatedCache<Query, Result> {
pw.println(TextUtils.formatSimple(" Key: %s\n Value: %s\n", key, value));
}
pw.flush();
}
}
@@ -1483,6 +1482,36 @@ public class PropertyInvalidatedCache<Query, Result> {
}
}
/**
* Without arguments, this dumps statistics from every cache in the process to the
* provided ParcelFileDescriptor. Optional switches allow the caller to choose
* specific caches (selection is by cache name or property name); if these switches
* are used then the output includes both cache statistics and cache entries.
*/
private static void dumpCacheInfo(@NonNull PrintWriter pw, @NonNull String[] args) {
if (!sEnabled) {
pw.println(" Caching is disabled in this process.");
return;
}
// See if detailed is requested for any cache. If there is a specific detailed request,
// then only that cache is reported.
boolean detail = anyDetailed(args);
ArrayList<PropertyInvalidatedCache> activeCaches;
synchronized (sCorkLock) {
activeCaches = getActiveCaches();
if (!detail) {
dumpCorkInfo(pw);
}
}
for (int i = 0; i < activeCaches.size(); i++) {
PropertyInvalidatedCache currentCache = activeCaches.get(i);
currentCache.dumpContents(pw, detail, args);
}
}
/**
* Without arguments, this dumps statistics from every cache in the process to the
* provided ParcelFileDescriptor. Optional switches allow the caller to choose
@@ -1491,31 +1520,21 @@ public class PropertyInvalidatedCache<Query, Result> {
* @hide
*/
public static void dumpCacheInfo(@NonNull ParcelFileDescriptor pfd, @NonNull String[] args) {
try (
FileOutputStream fout = new FileOutputStream(pfd.getFileDescriptor());
PrintWriter pw = new FastPrintWriter(fout);
) {
if (!sEnabled) {
pw.println(" Caching is disabled in this process.");
return;
}
// Create a PrintWriter that uses a byte array. The code can safely write to
// this array without fear of blocking. The completed byte array will be sent
// to the caller after all the data has been collected and all locks have been
// released.
ByteArrayOutputStream barray = new ByteArrayOutputStream();
PrintWriter bout = new PrintWriter(barray);
dumpCacheInfo(bout, args);
bout.close();
// See if detailed is requested for any cache. If there is a specific detailed request,
// then only that cache is reported.
boolean detail = anyDetailed(args);
ArrayList<PropertyInvalidatedCache> activeCaches;
synchronized (sCorkLock) {
activeCaches = getActiveCaches();
if (!detail) {
dumpCorkInfo(pw);
}
}
for (int i = 0; i < activeCaches.size(); i++) {
PropertyInvalidatedCache currentCache = activeCaches.get(i);
currentCache.dumpContents(pw, detail, args);
}
try {
// Send the final byte array to the output. This happens outside of all locks.
var out = new FileOutputStream(pfd.getFileDescriptor());
barray.writeTo(out);
out.close();
barray.close();
} catch (IOException e) {
Log.e(TAG, "Failed to dump PropertyInvalidatedCache instances");
}