stripping redundant GenProfiler

Mumfrey
1 parent 96db8836
Showing 7 changed files with 4 additions and 358 deletions
ant/build_liteloader.xml
java/client/com/mumfrey/liteloader/client/ClientEvents.java
java/client/com/mumfrey/liteloader/client/gen/GenProfiler.java
java/client/com/mumfrey/liteloader/client/gen/GenProfilerTransformer.java
java/client/com/mumfrey/liteloader/client/util/PrivateFields.java
java/common/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
java/common/com/mumfrey/liteloader/launch/LoaderProperties.java
@@ -223,7 +223,6 @@
 				<exclude name="?.class" />
 				<exclude name="??.class" />
 				<exclude name="???.class" />
-				<exclude name="/com/mumfrey/liteloader/core/gen/**" />
 			</fileset>
 		</copy>
@@ -6,16 +6,13 @@ import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.network.play.client.C01PacketChatMessage;
-import net.minecraft.profiler.Profiler;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.util.Timer;
 import org.lwjgl.input.Mouse;
 import com.mumfrey.liteloader.*;
-import com.mumfrey.liteloader.client.gen.GenProfiler;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
-import com.mumfrey.liteloader.client.util.PrivateFields;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.Events;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
@@ -44,14 +41,9 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	/**
 	 * Flags which keep track of whether hooks have been applied
 	 */
-	private boolean lateInitDone, profilerHooked;
+	private boolean lateInitDone;
 	/**
-	 * Profiler hook objects
-	 */
-	private Profiler genProfiler = null;
-	
-	/**
 	 * ScaledResolution used by the pre-chat and post-chat render callbacks
 	 */
 	private ScaledResolution currentResolution;
@@ -97,17 +89,6 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 		ClientEvents.instance = this;
 		this.engineClient = (GameEngineClient)engine;
-		try
-		{
-			if (properties.getBooleanProperty(LoaderProperties.OPTION_GENERATE_MAPPINGS))
-			{
-				this.genProfiler = GenProfiler.class.newInstance();
-			}
-		}
-		catch (Throwable th)
-		{
-//			th.printStackTrace();
-		}
 	}
 	static ClientEvents getInstance()
@@ -136,31 +117,12 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 		delegate.registerInterface(OutboundChatFilter.class);
 	}
-	/**
-	 * Initialise hooks
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.api.InterfaceProvider#initProvider()
 	 */
 	@Override
 	public void initProvider()
 	{
-		if (this.genProfiler != null)
-		{
-			try
-			{
-				LiteLoaderLogger.info("Event manager is registering the mapping generator hook");
-				
-				// Tick hook
-				if (!this.profilerHooked)
-				{
-					this.profilerHooked = true;
-					PrivateFields.minecraftProfiler.setFinal(this.engine.getClient(), this.genProfiler);
-				}
-			}
-			catch (Exception ex)
-			{
-				LiteLoaderLogger.warning(ex, "Error creating hook");
-				ex.printStackTrace();
-			}
-		}	
 	}
 	/**
-package com.mumfrey.liteloader.client.gen;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.profiler.Profiler;
-
-import com.mumfrey.liteloader.core.exceptions.ProfilerCrossThreadAccessException;
-import com.mumfrey.liteloader.core.exceptions.ProfilerStackCorruptionException;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
-/**
- * Profiler used for generating callback signatures for the callback injector
- *
- * @author Adam Mummery-Smith
- */
-public class GenProfiler extends Profiler
-{
-	/**
-	 * Cross-thread sanity check 
-	 */
-	private final Thread minecraftThread;
-	
-	/**
-	 * Section list, used as a kind of stack to determine where we are in the profiler stack
-	 */
-	private LinkedList<String> sectionStack = new LinkedList<String>();
-
-	/**
-	 * Minecraft reference, only set if optifine compatibility is enabled 
-	 */
-	private Minecraft mc;
-	
-	private static Map<String, String> eventSignatures = new HashMap<String, String>();
-	
-	private static Set<String> conflictedEvents = new HashSet<String>();
-
-	private static String lastEvent = null;
-	
-	private static String lastPosition = null;
-	
-	/**
-	 * .ctor
-	 * 
-	 * @param events LiteLoader object which will get callbacks
-	 * @param logger Logger instance
-	 */
-	public GenProfiler()
-	{
-		this.mc = Minecraft.getMinecraft();
-
-		this.minecraftThread = Thread.currentThread();
-	}
-
-	/* (non-Javadoc)
-	 * @see net.minecraft.profiler.Profiler#startSection(java.lang.String)
-	 */
-	@Override
-	public void startSection(String sectionName)
-	{
-		if (Thread.currentThread() != this.minecraftThread)
-		{
-			LiteLoaderLogger.severe("Profiler cross thread access detected, this indicates an error with one of your mods.");
-			throw new ProfilerCrossThreadAccessException(Thread.currentThread().getName());
-		}
-		
-		if ("gameRenderer".equals(sectionName) && "root".equals(this.sectionStack.getLast()))
-		{
-			this.debugEvent("onRender", sectionName);
-		}
-		else if ("frustrum".equals(sectionName) && "level".equals(this.sectionStack.getLast()))
-		{
-			this.debugEvent("onSetupCameraTransform", sectionName);
-		}
-		else if ("litParticles".equals(sectionName))
-		{
-			this.debugEvent("postRenderEntities", sectionName);
-		}
-		else if ("tick".equals(sectionName) && "root".equals(this.sectionStack.getLast()))
-		{
-			this.debugEvent("onTimerUpdate", sectionName);
-		}
-		else if ("chat".equals(sectionName))
-		{
-			this.debugEvent("onRenderChat", sectionName);
-		}
-		else if ("gui".equals(sectionName) && "gameRenderer".equals(this.sectionStack.getLast()))
-		{
-			this.debugEvent("onRenderHUD", sectionName);
-		}
-		
-		if ("animateTick".equals(sectionName))
-		{
-			this.debugEvent("onAnimateTick", sectionName);
-		}
-		
-		this.sectionStack.add(sectionName);
-		super.startSection(sectionName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see net.minecraft.profiler.Profiler#endSection()
-	 */
-	@Override
-	public void endSection()
-	{
-		if (Thread.currentThread() != this.minecraftThread)
-		{
-			LiteLoaderLogger.severe("Profiler cross thread access detected, this indicates an error with one of your mods.");
-			throw new ProfilerCrossThreadAccessException(Thread.currentThread().getName());
-		}
-		
-		super.endSection();
-		
-		try
-		{
-			String endingSection = this.sectionStack.size() > 0 ? this.sectionStack.removeLast() : null;
-			String nextSection = this.sectionStack.size() > 0 ? this.sectionStack.getLast() : null;
-			String sectionName = "end[" + endingSection + "] next[" + nextSection + "]";
-			
-			if ("gameRenderer".equals(endingSection) && "root".equals(nextSection))
-			{
-				this.debugEvent("onTick", sectionName);
-			}
-			else
-			{
-				if ("gui".equals(endingSection) && "gameRenderer".equals(nextSection) && this.mc.theWorld != null)
-				{
-					this.debugEvent("postRenderHUDandGUI", sectionName);
-				}
-				else if ("mouse".equals(endingSection) && "gameRenderer".equals(nextSection) && (this.mc.skipRenderWorld || this.mc.theWorld == null))
-				{
-					this.debugEvent("preRenderGUI", sectionName);
-				}
-				else if ("hand".equals(endingSection) && "level".equals(nextSection))
-				{
-					this.debugEvent("postRender", sectionName);
-				}
-				else if ("chat".equals(endingSection))
-				{
-					this.debugEvent("postRenderChat", sectionName);
-				}
-			}
-		}
-		catch (NoSuchElementException ex)
-		{
-			LiteLoaderLogger.severe("Corrupted Profiler stack detected, this indicates an error with one of your mods.");
-			throw new ProfilerStackCorruptionException("Corrupted Profiler stack detected");
-		}
-	}
-	
-	private void debugEvent(String lastEvent, String profilerPos)
-	{
-		GenProfiler.lastEvent = lastEvent;
-		GenProfiler.lastPosition = profilerPos;
-	}
-
-	public static void storeSignature(String signature)
-	{
-		if (GenProfiler.lastEvent == null) return;
-		if (signature.startsWith("// com")) return;
-		
-		if (!GenProfiler.eventSignatures.containsKey(GenProfiler.lastEvent))
-		{
-			GenProfiler.eventSignatures.put(GenProfiler.lastEvent, signature);
-			System.out.println("\n// " + GenProfiler.lastPosition + "\n" + signature.replace("<event>", GenProfiler.lastEvent));
-		}
-		else
-		{
-			if (!GenProfiler.eventSignatures.get(GenProfiler.lastEvent).equals(signature) && !GenProfiler.conflictedEvents.contains(GenProfiler.lastEvent))
-			{
-				GenProfiler.conflictedEvents.add(GenProfiler.lastEvent);
-				System.out.println("\n// CONFLICT\n// " + GenProfiler.lastPosition + "\n" + signature.replace("<event>", GenProfiler.lastEvent));
-			}
-		}
-	}
-}
 \ No newline at end of file
-package com.mumfrey.liteloader.client.gen;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.LdcInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-public class GenProfilerTransformer implements IClassTransformer
-{
-	private Map<String, Integer> references = new HashMap<String, Integer>();
-	
-	@Override
-	public byte[] transform(String name, String transformedName, byte[] basicClass)
-	{
-		if (basicClass != null && !Obf.Profiler.name.equals(name) && !Obf.Profiler.obf.equals(name))
-		{
-			return this.transformProfilerCalls(basicClass);
-		}
-		
-		return basicClass;
-	}
-	
-	private byte[] transformProfilerCalls(byte[] basicClass)
-	{
-		ClassNode classNode = this.readClass(basicClass);
-
-		for (MethodNode method : classNode.methods)
-		{
-			String section = null;
-			Map<MethodInsnNode, String> injectionNodes = new HashMap<MethodInsnNode, String>();
-			
-			Iterator<AbstractInsnNode> iter = method.instructions.iterator();
-			AbstractInsnNode lastInsn = null;
-			while (iter.hasNext())
-			{
-				AbstractInsnNode insn = iter.next();
-				if (insn.getOpcode() == Opcodes.INVOKEVIRTUAL)
-				{
-					MethodInsnNode invokeNode = (MethodInsnNode)insn;
-					if (Obf.Profiler.ref.equals(invokeNode.owner) || Obf.Profiler.obf.equals(invokeNode.owner))
-					{
-						if (lastInsn instanceof LdcInsnNode)
-							section = ((LdcInsnNode)lastInsn).cst.toString();
-						else
-							section = "";
-
-						if ("(Ljava/lang/String;)V".equals(invokeNode.desc) || ("()V".equals(invokeNode.desc) && ("endSection".equals(invokeNode.name) || "b".equals(invokeNode.name))))
-						{
-							String signature = this.generateSignature(classNode.name, method.name, method.desc, invokeNode.name, invokeNode.desc, section);
-							
-							int refCount = 0;
-							if (this.references.containsKey(signature))
-								refCount = this.references.get(signature).intValue(); 
-							
-							String mapping = "// " + signature + "\nthis.addMapping(\"" + classNode.name.replace('/', '.') + "\", \"" + method.name + "\", \"" + method.desc + "\", \"" + invokeNode.name + "\", \"" + section + "\", new Callback(\"<event>\")); // ref " + refCount; 
-							this.references.put(signature, Integer.valueOf(refCount + 1));
-							injectionNodes.put(invokeNode, mapping);
-						}
-					}
-				}
-				
-				lastInsn = insn;
-			}
-			
-			for (Entry<MethodInsnNode, String> node : injectionNodes.entrySet())
-			{
-				method.instructions.insert(node.getKey(), new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/gen/GenProfiler", "storeSignature", "(Ljava/lang/String;)V", false));
-				method.instructions.insert(node.getKey(), new LdcInsnNode(node.getValue()));
-			}
-		}
-		
-		return this.writeClass(classNode);
-	}
-	
-	/**
-	 * @param basicClass
-	 * @return
-	 */
-	private ClassNode readClass(byte[] basicClass)
-	{
-		ClassReader classReader = new ClassReader(basicClass);
-		ClassNode classNode = new ClassNode();
-		classReader.accept(classNode, ClassReader.SKIP_FRAMES);
-		return classNode;
-	}
-
-	/**
-	 * @param classNode
-	 * @return
-	 */
-	private byte[] writeClass(ClassNode classNode)
-	{
-		ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-		classNode.accept(writer);
-		return writer.toByteArray();
-	}
-	
-	/**
-	 * @param className
-	 * @param methodName
-	 * @param methodSignature
-	 * @param invokeName
-	 * @param invokeSig
-	 * @param section
-	 * @return
-	 */
-	private String generateSignature(String className, String methodName, String methodSignature, String invokeName, String invokeSig, String section)
-	{
-		return String.format("%s::%s%s@%s%s/%s", className.replace('.', '/'), methodName, methodSignature, invokeName, invokeSig, section);
-	}
-}
@@ -140,7 +140,6 @@ public class PrivateFields&lt;P, T&gt;
 		return value;
 	}
-	public static final PrivateFields<Minecraft, Profiler>                         minecraftProfiler = new PrivateFields<Minecraft, Profiler>                     (Minecraft.class,                    Obf.minecraftProfiler);
 	public static final PrivateFields<RenderManager, Map>                            entityRenderMap = new PrivateFields<RenderManager, Map>                      (RenderManager.class,                Obf.entityRenderMap);
 	public static final PrivateFields<NetHandlerLoginClient, NetworkManager>              netManager = new PrivateFields<NetHandlerLoginClient, NetworkManager>   (NetHandlerLoginClient.class,        Obf.netManager);
 	public static final PrivateFields<RegistrySimple, Map>                           registryObjects = new PrivateFields<RegistrySimple, Map>                     (RegistrySimple.class,               Obf.registryObjects);                     
@@ -28,10 +28,10 @@ public class LiteLoaderTweaker implements ITweaker
 	public static final int ENV_TYPE_CLIENT = 0;
 	public static final int ENV_TYPE_DEDICATEDSERVER = 1;
+	// TODO Version - 1.7.10
 	public static final String VERSION = "1.7.10";
 	protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap";
-	protected static final String genTransformerClassName = "com.mumfrey.liteloader.client.gen.GenProfilerTransformer";
 	/**
 	 * Loader startup state
@@ -327,13 +327,6 @@ public class LiteLoaderTweaker implements ITweaker
 		LiteLoaderTweaker.instance.transformerManager.injectUpstreamTransformers(classLoader);
-		LoaderBootstrap bootstrap = LiteLoaderTweaker.instance.bootstrap;
-		if (bootstrap instanceof LoaderProperties && ((LoaderProperties)bootstrap).getBooleanProperty(LoaderProperties.OPTION_GENERATE_MAPPINGS))
-		{
-			LiteLoaderLogger.info("Injecting gen trasnformer '%s'", LiteLoaderTweaker.genTransformerClassName);
-			LiteLoaderTweaker.instance.transformerManager.injectTransformer(LiteLoaderTweaker.genTransformerClassName);
-		}
-		
 		for (String transformerClassName : this.bootstrap.getRequiredDownstreamTransformers())
 		{
 			LiteLoaderLogger.info("Queuing required class transformer '%s'", transformerClassName);
@@ -89,7 +89,6 @@ public interface LoaderProperties
 	// General properties
 	public static final String OPTION_SOUND_MANAGER_FIX = "soundManagerFix";
-	public static final String OPTION_GENERATE_MAPPINGS = "genMappings";
 	public static final String OPTION_MOD_INFO_SCREEN   = "modInfoScreen";
 	public static final String OPTION_NO_HIDE_TAB       = "tabAlwaysExpanded";
 	public static final String OPTION_BRAND             = "brand";