From 237efbc625e5e3184509251858f8deca4d30b420 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 23 Nov 2015 12:33:12 +0000 Subject: [PATCH] Minor housekeeping --- .../spongepowered/tools/agent/MixinAgent.java | 75 ++++++++++++------- .../tools/agent/MixinAgentClassLoader.java | 4 +- .../asm/mixin/transformer/MixinInfo.java | 10 +-- 3 files changed, 54 insertions(+), 35 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 85132c6f..156a2252 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -57,39 +57,17 @@ public class MixinAgent implements IHotSwap { if (classBeingRedefined == null) { return null; } + byte[] mixinBytecode = MixinAgent.classLoader.getFakeMixinBytecode(classBeingRedefined); if (mixinBytecode != null) { - MixinAgent.logger.info("Redefining mixin " + className); - List targets; - try { - targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); - } catch (MixinReloadException e) { - MixinAgent.logger.error("mixin " + e.getMixinInfo() + " cannot be reloaded, needs a restart to be applied: " + e.getMessage()); - return MixinAgent.ERROR_BYTECODE; - } catch (Throwable th) { - // catch everything as otherwise it is ignored - MixinAgent.logger.error("Error while finding targets for mixin " + className, th); + List targets = this.reloadMixin(className, classfileBuffer); + if (targets == null || !this.reApplyMixins(targets)) { return MixinAgent.ERROR_BYTECODE; } - for (String target : targets) { - String targetName = target.replace('/', '.'); - MixinAgent.logger.debug("Re-transforming target class " + target); - try { - Class targetClass = Launch.classLoader.findClass(targetName); - byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); - if (targetBytecode == null) { - MixinAgent.logger.error("Target class " + targetName + " hasn't registered its bytecode"); - return MixinAgent.ERROR_BYTECODE; - } - targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); - instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); - } catch (Throwable th) { - MixinAgent.logger.error("Error while re-transforming target class " + target, th); - return MixinAgent.ERROR_BYTECODE; - } - } + return mixinBytecode; } + try { MixinAgent.logger.info("Redefining class " + className); return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); @@ -98,6 +76,47 @@ public class MixinAgent implements IHotSwap { return MixinAgent.ERROR_BYTECODE; } } + + private List reloadMixin(String className, byte[] classfileBuffer) { + MixinAgent.logger.info("Redefining mixin {}", className); + try { + return MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); + } catch (MixinReloadException e) { + MixinAgent.logger.error("Mixin {} cannot be reloaded, needs a restart to be applied: {} ", e.getMixinInfo(), e.getMessage()); + } catch (Throwable th) { + // catch everything as otherwise it is ignored + MixinAgent.logger.error("Error while finding targets for mixin " + className, th); + } + return null; + } + + /** + * Re-apply all mixins to the supplied list of target classes. + * + * @param targets Target classes to re-transform + * @return true if all targets were transformed, false if transformation + * failed + */ + private boolean reApplyMixins(List targets) { + for (String target : targets) { + String targetName = target.replace('/', '.'); + MixinAgent.logger.debug("Re-transforming target class {}", target); + try { + Class targetClass = Launch.classLoader.findClass(targetName); + byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); + if (targetBytecode == null) { + MixinAgent.logger.error("Target class {} bytecode is not registered", targetName); + return false; + } + targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); + MixinAgent.instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); + } catch (Throwable th) { + MixinAgent.logger.error("Error while re-transforming target class " + target, th); + return false; + } + } + return true; + } } /** @@ -169,7 +188,7 @@ public class MixinAgent implements IHotSwap { if (!MixinAgent.instrumentation.isRedefineClassesSupported()) { MixinAgent.logger.error("The instrumentation doesn't support re-definition of classes"); } - for (MixinAgent agent:agents) { + for (MixinAgent agent : MixinAgent.agents) { agent.initTransformer(); } } diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java index 5eaa2946..eb9ea2fc 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java @@ -60,7 +60,7 @@ class MixinAgentClassLoader extends ClassLoader { * @param name Name of the fake class */ void addMixinClass(String name) { - MixinAgentClassLoader.logger.debug("Mixin class " + name + " added to class loader"); + MixinAgentClassLoader.logger.debug("Mixin class {} added to class loader", name); try { byte[] bytes = this.materialise(name); Class clazz = this.defineClass(name, bytes, 0, bytes.length); @@ -69,7 +69,7 @@ class MixinAgentClassLoader extends ClassLoader { clazz.newInstance(); this.mixins.put(clazz, bytes); } catch (Throwable e) { - logger.catching(e); + MixinAgentClassLoader.logger.catching(e); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 4b3dd05b..9ce92e85 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -225,6 +225,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private final transient IMixinConfigPlugin plugin; + /** + * The environment phase in which this mixin was initialised + */ + private final transient Phase phase; + /** * Holds state that currently is not fully initialised or validated */ @@ -235,11 +240,6 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private transient ValidationState validationState; - /** - * The environment phase in which this mixin was initialised - */ - private final transient Phase phase; - /** * Internal ctor, called by {@link MixinConfig} *