From 2060164ec850916106a9c411034fcf7ded6fb55b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 14 Apr 2016 14:43:31 +0100 Subject: [PATCH] Fix this stupid message once and for all, closes #107 --- .../asm/mixin/transformer/MixinConfig.java | 22 ++++++++++++++++++- .../mixin/transformer/MixinTransformer.java | 17 ++++++++++---- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index a73edd6c..cc1b22c9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -26,6 +26,7 @@ package org.spongepowered.asm.mixin.transformer; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -464,12 +465,21 @@ class MixinConfig implements Comparable, IMixinConfig { String defaultGroup = this.injectorOptions.defaultGroup; return defaultGroup != null && !defaultGroup.isEmpty() ? defaultGroup : "default"; } - + /** * Get the number of mixins in this config, for debug logging * * @return total enumerated mixins in set */ + int getDeclaredMixinCount() { + return MixinConfig.getCollectionSize(this.mixinClasses, this.mixinClassesClient, this.mixinClassesServer); + } + + /** + * Get the number of mixins actually initialised, for debug logging + * + * @return total enumerated mixins in set + */ int getMixinCount() { return this.mixins.size(); } @@ -648,4 +658,14 @@ class MixinConfig implements Comparable, IMixinConfig { } } + private static int getCollectionSize(Collection... collections) { + int total = 0; + for (Collection collection : collections) { + if (collection != null) { + total += collection.size(); + } + } + return total; + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java index 7799a8b0..d7e6b1fa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -486,12 +486,14 @@ public class MixinTransformer extends TreeTransformer { this.addConfigs(environment); this.addModules(environment); - this.initConfigs(); + int totalMixins = this.initConfigs(); this.currentEnvironment = environment; double elapsedTime = (System.currentTimeMillis() - startTime) * 0.001D; if (elapsedTime > 0.25D) { - this.logger.log(this.verboseLoggingLevel, "Mixin preparation completed in {} sec", new DecimalFormat("###0.000").format(elapsedTime)); + String elapsed = new DecimalFormat("###0.000").format(elapsedTime); + String perMixinTime = new DecimalFormat("###0.0").format((elapsedTime / totalMixins) * 1000.0); + this.logger.log(this.verboseLoggingLevel, "Prepared {} mixins in {} sec ({} msec avg.)", totalMixins, elapsed, perMixinTime); } } @@ -541,12 +543,17 @@ public class MixinTransformer extends TreeTransformer { /** * Initialise mixin configs + * + * @return total number of mixins initialised */ - private void initConfigs() { + private int initConfigs() { + int totalMixins = 0; + for (MixinConfig config : this.pendingConfigs) { try { + this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getDeclaredMixinCount()); config.initialise(this.hotSwapper); - this.logger.log(this.verboseLoggingLevel, "Prepared {} ({})", config, config.getMixinCount()); + totalMixins += config.getMixinCount(); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); } @@ -579,6 +586,8 @@ public class MixinTransformer extends TreeTransformer { this.configs.addAll(this.pendingConfigs); Collections.sort(this.configs); this.pendingConfigs.clear(); + + return totalMixins; } /**