Merge "Split out the apk assets cache lock" (92c4fd4b) · Commits · e / os / android_frameworks_base

core/java/android/app/ResourcesManager.java

+49 −44

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import android.os.Trace;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.DisplayMetrics;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Slog;
		@@ -51,7 +52,6 @@ import android.window.WindowContext;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.IndentingPrintWriter;

		import java.io.IOException;
		import java.io.PrintWriter;
		@@ -173,6 +173,7 @@ public class ResourcesManager {

		/**
		* The ApkAssets that are being referenced in the wild that we can reuse.
		* Used as a lock for itself as well.
		*/
		private final ArrayMap<ApkKey, WeakReference<ApkAssets>> mCachedApkAssets = new ArrayMap<>();

		@@ -286,43 +287,44 @@ public class ResourcesManager {
		* try as hard as possible to release any open FDs.
		*/
		public void invalidatePath(String path) {
		final List<ResourcesImpl> implsToFlush = new ArrayList<>();
		synchronized (mLock) {
		int count = 0;

		for (int i = mResourceImpls.size() - 1; i >= 0; i--) {
		final ResourcesKey key = mResourceImpls.keyAt(i);
		if (key.isPathReferenced(path)) {
		ResourcesImpl impl = mResourceImpls.removeAt(i).get();
		if (impl != null) {
		impl.flushLayoutCache();
		ResourcesImpl resImpl = mResourceImpls.removeAt(i).get();
		if (resImpl != null) {
		implsToFlush.add(resImpl);
		}
		count++;
		}
		}

		Log.i(TAG, "Invalidated " + count + " asset managers that referenced " + path);

		}
		for (int i = 0; i < implsToFlush.size(); i++) {
		implsToFlush.get(i).flushLayoutCache();
		}
		final List<ApkAssets> assetsToClose = new ArrayList<>();
		synchronized (mCachedApkAssets) {
		for (int i = mCachedApkAssets.size() - 1; i >= 0; i--) {
		final ApkKey key = mCachedApkAssets.keyAt(i);
		if (key.path.equals(path)) {
		final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.removeAt(i);
		if (apkAssetsRef == null) {
		continue;
		}
		final ApkAssets apkAssets = apkAssetsRef.get();
		final ApkAssets apkAssets = apkAssetsRef != null ? apkAssetsRef.get() : null;
		if (apkAssets != null) {
		apkAssets.close();
		assetsToClose.add(apkAssets);
		}
		}
		}
		}
		for (int i = 0; i < assetsToClose.size(); i++) {
		assetsToClose.get(i).close();
		}
		Log.i(TAG,
		"Invalidated " + implsToFlush.size() + " asset managers that referenced " + path);
		}

		public Configuration getConfiguration() {
		synchronized (mLock) {
		return mResConfiguration;
		}
		}

		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public DisplayMetrics getDisplayMetrics() {
		@@ -406,7 +408,6 @@ public class ResourcesManager {
		* @param resources The {@link Resources} backing the display adjustments.
		*/
		public Display getAdjustedDisplay(final int displayId, Resources resources) {
		synchronized (mLock) {
		final DisplayManagerGlobal dm = DisplayManagerGlobal.getInstance();
		if (dm == null) {
		// may be null early in system startup
		@@ -414,7 +415,6 @@ public class ResourcesManager {
		}
		return dm.getCompatibleDisplay(displayId, resources);
		}
		}

		/**
		* Initializes the set of APKs owned by the application running in this process.
		@@ -451,7 +451,7 @@ public class ResourcesManager {

		// Optimistically check if this ApkAssets exists somewhere else.
		final WeakReference<ApkAssets> apkAssetsRef;
		synchronized (mLock) {
		synchronized (mCachedApkAssets) {
		apkAssetsRef = mCachedApkAssets.get(key);
		}
		if (apkAssetsRef != null) {
		@@ -474,7 +474,7 @@ public class ResourcesManager {
		apkAssets = ApkAssets.loadFromPath(key.path, flags);
		}

		synchronized (mLock) {
		synchronized (mCachedApkAssets) {
		mCachedApkAssets.put(key, new WeakReference<>(apkAssets));
		}

		@@ -586,28 +586,33 @@ public class ResourcesManager {
		* @hide
		*/
		public void dump(String prefix, PrintWriter printWriter) {
		final int references;
		final int resImpls;
		synchronized (mLock) {
		IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, " ");
		int refs = countLiveReferences(mResourceReferences);
		for (ActivityResources activityResources : mActivityResourceReferences.values()) {
		refs += activityResources.countLiveReferences();
		}
		references = refs;
		resImpls = countLiveReferences(mResourceImpls.values());
		}
		final int liveAssets;
		synchronized (mCachedApkAssets) {
		liveAssets = countLiveReferences(mCachedApkAssets.values());
		}

		final var pw = new IndentingPrintWriter(printWriter, " ");
		for (int i = 0; i < prefix.length() / 2; i++) {
		pw.increaseIndent();
		}

		pw.println("ResourcesManager:");
		pw.increaseIndent();
		pw.print("total apks: ");
		pw.println(countLiveReferences(mCachedApkAssets.values()));

		pw.println(liveAssets);
		pw.print("resources: ");

		int references = countLiveReferences(mResourceReferences);
		for (ActivityResources activityResources : mActivityResourceReferences.values()) {
		references += activityResources.countLiveReferences();
		}
		pw.println(references);

		pw.print("resource impls: ");
		pw.println(countLiveReferences(mResourceImpls.values()));
		}
		pw.println(resImpls);
		}

		private Configuration generateConfig(@NonNull ResourcesKey key) {