From 0e571eeb19395d64753a5d6b03272e9e434fcce3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 2 Jun 2013 21:27:09 -0700 Subject: [PATCH] Add cache for ASM Event Handler bridge classes, should not need to redefine a class to invoke the same method on different instances. --- .../net/minecraftforge/event/ASMEventHandler.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/net/minecraftforge/event/ASMEventHandler.java b/common/net/minecraftforge/event/ASMEventHandler.java index fdddb3993e..a9af9d3290 100644 --- a/common/net/minecraftforge/event/ASMEventHandler.java +++ b/common/net/minecraftforge/event/ASMEventHandler.java @@ -3,12 +3,15 @@ package net.minecraftforge.event; import static org.objectweb.asm.Opcodes.*; import java.lang.reflect.Method; +import java.util.HashMap; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; +import com.google.common.collect.Maps; + public class ASMEventHandler implements IEventListener { @@ -16,6 +19,7 @@ public class ASMEventHandler implements IEventListener private static final String HANDLER_DESC = Type.getInternalName(IEventListener.class); private static final String HANDLER_FUNC_DESC = Type.getMethodDescriptor(IEventListener.class.getDeclaredMethods()[0]); private static final ASMClassLoader LOADER = new ASMClassLoader(); + private static final HashMap> cache = Maps.newHashMap(); private final IEventListener handler; private final ForgeSubscribe subInfo; @@ -44,6 +48,11 @@ public class ASMEventHandler implements IEventListener public Class createWrapper(Method callback) { + if (cache.containsKey(callback)) + { + return cache.get(callback); + } + ClassWriter cw = new ClassWriter(0); MethodVisitor mv; @@ -92,7 +101,9 @@ public class ASMEventHandler implements IEventListener mv.visitEnd(); } cw.visitEnd(); - return LOADER.define(name, cw.toByteArray()); + Class ret = LOADER.define(name, cw.toByteArray()); + cache.put(callback, ret); + return ret; } private String getUniqueName(Method callback)