Merge "Cache AndroidBlockGuardPolicy to avoid allocation." (214816da) · Commits · e / os / android_frameworks_base

core/java/android/os/StrictMode.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -783,13 +783,15 @@ public final class StrictMode {
		BlockGuard.setThreadPolicy(BlockGuard.LAX_POLICY);
		return;
		}
		BlockGuard.Policy policy = BlockGuard.getThreadPolicy();
		if (!(policy instanceof AndroidBlockGuardPolicy)) {
		BlockGuard.setThreadPolicy(new AndroidBlockGuardPolicy(policyMask));
		final BlockGuard.Policy policy = BlockGuard.getThreadPolicy();
		final AndroidBlockGuardPolicy androidPolicy;
		if (policy instanceof AndroidBlockGuardPolicy) {
		androidPolicy = (AndroidBlockGuardPolicy) policy;
		} else {
		AndroidBlockGuardPolicy androidPolicy = (AndroidBlockGuardPolicy) policy;
		androidPolicy.setPolicyMask(policyMask);
		androidPolicy = threadAndroidPolicy.get();
		BlockGuard.setThreadPolicy(androidPolicy);
		}
		androidPolicy.setPolicyMask(policyMask);
		}

		// Sets up CloseGuard in Dalvik/libcore
		@@ -1060,6 +1062,14 @@ public final class StrictMode {
		}
		};

		private static final ThreadLocal<AndroidBlockGuardPolicy>
		threadAndroidPolicy = new ThreadLocal<AndroidBlockGuardPolicy>() {
		@Override
		protected AndroidBlockGuardPolicy initialValue() {
		return new AndroidBlockGuardPolicy(0);
		}
		};

		private static boolean tooManyViolationsThisLoop() {
		return violationsBeingTimed.get().size() >= MAX_OFFENSES_PER_LOOP;
		}

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.os;

		import android.os.StrictMode.ThreadPolicy;

		import com.google.caliper.SimpleBenchmark;

		public class StrictModeBenchmark extends SimpleBenchmark {

		private ThreadPolicy mOff = new ThreadPolicy.Builder().build();
		private ThreadPolicy mOn = new ThreadPolicy.Builder().detectAll().build();

		public void timeToggleThreadPolicy(int reps) {
		for (int i = 0; i < reps; i++) {
		StrictMode.setThreadPolicy(mOn);
		StrictMode.setThreadPolicy(mOff);
		}
		}
		}