Merge "Merge "ASM Priority Boost Tool" am: 8ff8dd16cc am: 8ac18ceb8a" into oc-dev-plus-aosp (94e68505) · Commits · e / os / android_frameworks_base

tools/locked_region_code_injection/Android.mk

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)

		LOCAL_JAR_MANIFEST := manifest.txt
		LOCAL_MODULE := lockedregioncodeinjection
		LOCAL_SRC_FILES := $(call all-java-files-under,src)
		LOCAL_STATIC_JAVA_LIBRARIES := \
		asm-5.2 \
		asm-commons-5.2 \
		asm-tree-5.2 \
		asm-analysis-5.2


		include $(BUILD_HOST_JAVA_LIBRARY)

tools/locked_region_code_injection/manifest.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		Main-Class: lockedregioncodeinjection.Main

tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java

0 → 100644

+241 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 lockedregioncodeinjection;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.LinkedList;
		import java.util.List;
		import org.objectweb.asm.ClassVisitor;
		import org.objectweb.asm.MethodVisitor;
		import org.objectweb.asm.Opcodes;
		import org.objectweb.asm.commons.TryCatchBlockSorter;
		import org.objectweb.asm.tree.AbstractInsnNode;
		import org.objectweb.asm.tree.InsnList;
		import org.objectweb.asm.tree.LabelNode;
		import org.objectweb.asm.tree.MethodInsnNode;
		import org.objectweb.asm.tree.MethodNode;
		import org.objectweb.asm.tree.TryCatchBlockNode;
		import org.objectweb.asm.tree.analysis.Analyzer;
		import org.objectweb.asm.tree.analysis.AnalyzerException;
		import org.objectweb.asm.tree.analysis.BasicValue;
		import org.objectweb.asm.tree.analysis.Frame;

		/**
		* This visitor does two things:
		*
		* 1. Finds all the MONITOR_ENTER / MONITOR_EXIT in the byte code and insert the corresponding pre
		* and post methods calls should it matches one of the given target type in the Configuration.
		*
		* 2. Find all methods that are synchronized and insert pre method calls in the beginning and post
		* method calls just before all return instructions.
		*/
		class LockFindingClassVisitor extends ClassVisitor {
		private String className = null;
		private final List<LockTarget> targets;

		public LockFindingClassVisitor(List<LockTarget> targets, ClassVisitor chain) {
		super(Utils.ASM_VERSION, chain);
		this.targets = targets;
		}

		@Override
		public MethodVisitor visitMethod(int access, String name, String desc, String signature,
		String[] exceptions) {
		assert this.className != null;
		MethodNode mn = new TryCatchBlockSorter(null, access, name, desc, signature, exceptions);
		MethodVisitor chain = super.visitMethod(access, name, desc, signature, exceptions);
		return new LockFindingMethodVisitor(this.className, mn, chain);
		}

		@Override
		public void visit(int version, int access, String name, String signature, String superName,
		String[] interfaces) {
		this.className = name;
		super.visit(version, access, name, signature, superName, interfaces);
		}

		class LockFindingMethodVisitor extends MethodVisitor {
		private String owner;
		private MethodVisitor chain;

		public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) {
		super(Opcodes.ASM5, mn);
		assert owner != null;
		this.owner = owner;
		this.chain = chain;
		}

		@SuppressWarnings("unchecked")
		@Override
		public void visitEnd() {
		MethodNode mn = (MethodNode) mv;

		Analyzer a = new Analyzer(new LockTargetStateAnalysis(targets));

		LockTarget ownerMonitor = null;
		if ((mn.access & Opcodes.ACC_SYNCHRONIZED) != 0) {
		for (LockTarget t : targets) {
		if (t.getTargetDesc().equals("L" + owner + ";")) {
		ownerMonitor = t;
		}
		}
		}

		try {
		a.analyze(owner, mn);
		} catch (AnalyzerException e) {
		e.printStackTrace();
		}
		InsnList instructions = mn.instructions;

		Frame[] frames = a.getFrames();
		List<Frame> frameMap = new LinkedList<>();
		frameMap.addAll(Arrays.asList(frames));

		List<List<TryCatchBlockNode>> handlersMap = new LinkedList<>();

		for (int i = 0; i < instructions.size(); i++) {
		handlersMap.add(a.getHandlers(i));
		}

		if (ownerMonitor != null) {
		AbstractInsnNode s = instructions.getFirst();
		MethodInsnNode call = new MethodInsnNode(Opcodes.INVOKESTATIC,
		ownerMonitor.getPreOwner(), ownerMonitor.getPreMethod(), "()V", false);
		insertMethodCallBefore(mn, frameMap, handlersMap, s, 0, call);
		}

		for (int i = 0; i < instructions.size(); i++) {
		AbstractInsnNode s = instructions.get(i);

		if (s.getOpcode() == Opcodes.MONITORENTER) {
		Frame f = frameMap.get(i);
		BasicValue operand = (BasicValue) f.getStack(f.getStackSize() - 1);
		if (operand instanceof LockTargetState) {
		LockTargetState state = (LockTargetState) operand;
		for (int j = 0; j < state.getTargets().size(); j++) {
		LockTarget target = state.getTargets().get(j);
		MethodInsnNode call = new MethodInsnNode(Opcodes.INVOKESTATIC,
		target.getPreOwner(), target.getPreMethod(), "()V", false);
		insertMethodCallAfter(mn, frameMap, handlersMap, s, i, call);
		}
		}
		}

		if (s.getOpcode() == Opcodes.MONITOREXIT) {
		Frame f = frameMap.get(i);
		BasicValue operand = (BasicValue) f.getStack(f.getStackSize() - 1);
		if (operand instanceof LockTargetState) {
		LockTargetState state = (LockTargetState) operand;
		for (int j = 0; j < state.getTargets().size(); j++) {
		LockTarget target = state.getTargets().get(j);
		MethodInsnNode call = new MethodInsnNode(Opcodes.INVOKESTATIC,
		target.getPostOwner(), target.getPostMethod(), "()V", false);
		insertMethodCallAfter(mn, frameMap, handlersMap, s, i, call);
		}
		}
		}

		if (ownerMonitor != null && (s.getOpcode() == Opcodes.RETURN
		\|\| s.getOpcode() == Opcodes.ARETURN \|\| s.getOpcode() == Opcodes.DRETURN
		\|\| s.getOpcode() == Opcodes.FRETURN \|\| s.getOpcode() == Opcodes.IRETURN)) {
		MethodInsnNode call =
		new MethodInsnNode(Opcodes.INVOKESTATIC, ownerMonitor.getPostOwner(),
		ownerMonitor.getPostMethod(), "()V", false);
		insertMethodCallBefore(mn, frameMap, handlersMap, s, i, call);
		i++; // Skip ahead. Otherwise, we will revisit this instruction again.
		}
		}
		super.visitEnd();
		mn.accept(chain);
		}
		}

		public static void insertMethodCallBefore(MethodNode mn, List<Frame> frameMap,
		List<List<TryCatchBlockNode>> handlersMap, AbstractInsnNode node, int index,
		MethodInsnNode call) {
		List<TryCatchBlockNode> handlers = handlersMap.get(index);
		InsnList instructions = mn.instructions;
		LabelNode end = new LabelNode();
		instructions.insert(node, end);
		frameMap.add(index, null);
		handlersMap.add(index, null);
		instructions.insertBefore(node, call);
		frameMap.add(index, null);
		handlersMap.add(index, null);

		LabelNode start = new LabelNode();
		instructions.insert(node, start);
		frameMap.add(index, null);
		handlersMap.add(index, null);
		updateCatchHandler(mn, handlers, start, end, handlersMap);
		}

		public static void insertMethodCallAfter(MethodNode mn, List<Frame> frameMap,
		List<List<TryCatchBlockNode>> handlersMap, AbstractInsnNode node, int index,
		MethodInsnNode call) {
		List<TryCatchBlockNode> handlers = handlersMap.get(index + 1);
		InsnList instructions = mn.instructions;

		LabelNode end = new LabelNode();
		instructions.insert(node, end);
		frameMap.add(index + 1, null);
		handlersMap.add(index + 1, null);

		instructions.insert(node, call);
		frameMap.add(index + 1, null);
		handlersMap.add(index + 1, null);

		LabelNode start = new LabelNode();
		instructions.insert(node, start);
		frameMap.add(index + 1, null);
		handlersMap.add(index + 1, null);

		updateCatchHandler(mn, handlers, start, end, handlersMap);
		}

		@SuppressWarnings("unchecked")
		public static void updateCatchHandler(MethodNode mn, List<TryCatchBlockNode> handlers,
		LabelNode start, LabelNode end, List<List<TryCatchBlockNode>> handlersMap) {
		if (handlers == null \|\| handlers.size() == 0) {
		return;
		}

		InsnList instructions = mn.instructions;
		List<TryCatchBlockNode> newNodes = new ArrayList<>(handlers.size());
		for (TryCatchBlockNode handler : handlers) {
		if (!(instructions.indexOf(handler.start) <= instructions.indexOf(start)
		&& instructions.indexOf(end) <= instructions.indexOf(handler.end))) {
		TryCatchBlockNode newNode =
		new TryCatchBlockNode(start, end, handler.handler, handler.type);
		newNodes.add(newNode);
		for (int i = instructions.indexOf(start); i <= instructions.indexOf(end); i++) {
		if (handlersMap.get(i) == null) {
		handlersMap.set(i, new ArrayList<>());
		}
		handlersMap.get(i).add(newNode);
		}
		} else {
		for (int i = instructions.indexOf(start); i <= instructions.indexOf(end); i++) {
		if (handlersMap.get(i) == null) {
		handlersMap.set(i, new ArrayList<>());
		}
		handlersMap.get(i).add(handler);
		}
		}
		}
		mn.tryCatchBlocks.addAll(0, newNodes);
		}
		}

tools/locked_region_code_injection/src/lockedregioncodeinjection/LockTarget.java

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 lockedregioncodeinjection;

		/**
		* Represent a specific class that is used for synchronization. A pre and post method can be
		* specified to by the user to be called right after monitor_enter and after monitor_exit
		* respectively.
		*/
		public class LockTarget {
		public static final LockTarget NO_TARGET = new LockTarget("", null, null);

		private final String targetDesc;
		private final String pre;
		private final String post;

		public LockTarget(String targetDesc, String pre, String post) {
		this.targetDesc = targetDesc;
		this.pre = pre;
		this.post = post;
		}

		public String getTargetDesc() {
		return targetDesc;
		}

		public String getPre() {
		return pre;
		}

		public String getPreOwner() {
		return pre.substring(0, pre.lastIndexOf('.'));
		}

		public String getPreMethod() {
		return pre.substring(pre.lastIndexOf('.') + 1);
		}

		public String getPost() {
		return post;
		}

		public String getPostOwner() {
		return post.substring(0, post.lastIndexOf('.'));
		}

		public String getPostMethod() {
		return post.substring(post.lastIndexOf('.') + 1);
		}
		}

tools/locked_region_code_injection/src/lockedregioncodeinjection/LockTargetState.java

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 lockedregioncodeinjection;

		import java.util.List;
		import org.objectweb.asm.Type;
		import org.objectweb.asm.tree.analysis.BasicValue;

		public class LockTargetState extends BasicValue {
		private final List<LockTarget> lockTargets;

		/**
		* @param type
		*/
		public LockTargetState(Type type, List<LockTarget> lockTargets) {
		super(type);
		this.lockTargets = lockTargets;
		}

		public List<LockTarget> getTargets() {
		return lockTargets;
		}
		}