Merge pull request #6 from thiakil/speedy-getsources

Speedy getsources + sig fix

1 files changed, 11 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index 0e03753..b2cecfe 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -163,6 +163,10 @@ public class Deobfuscator {
         }
 
         public CompilationUnit getSourceTree(String className) {
+                return getSourceTree(className, createTypeLoader());
+        }
+
+        public CompilationUnit getSourceTree(String className, ITranslatingTypeLoader loader) {
 
                 // we don't know if this class name is obfuscated or deobfuscated
                 // we need to tell the decompiler the deobfuscated name so it doesn't get freaked out
@@ -178,7 +182,6 @@ public class Deobfuscator {
                 }
 
                 // set the desc loader
-                TranslatingTypeLoader loader = createTypeLoader();
                 this.settings.setTypeLoader(loader);
 
                 // see if procyon can find the desc
@@ -267,6 +270,10 @@ public class Deobfuscator {
                         progress.init(classEntries.size(), "Decompiling classes...");
                 }
 
+                //create a common instance outside the loop as mappings shouldn't be changing while this is happening
+                //synchronized to make sure the parallelStream doesn't CME with the cache
+                ITranslatingTypeLoader typeLoader = new SynchronizedTypeLoader(createTypeLoader());
+
                 // DEOBFUSCATE ALL THE THINGS!! @_@
                 Stopwatch stopwatch = Stopwatch.createStarted();
                 AtomicInteger count = new AtomicInteger();
@@ -278,7 +285,7 @@ public class Deobfuscator {
 
                         try {
                                 // get the source
-                                CompilationUnit sourceTree = getSourceTree(obfClassEntry.getName());
+                                CompilationUnit sourceTree = getSourceTree(obfClassEntry.getName(), typeLoader);
 
                                 // write the file
                                 File file = new File(dirOut, deobfClassEntry.getName().replace('.', '/') + ".java");
@@ -295,7 +302,7 @@ public class Deobfuscator {
                         }
                 });
                 stopwatch.stop();
-                System.out.println("Done in : " + stopwatch.toString());
+                System.out.println("writeSources Done in : " + stopwatch.toString());
                 if (progress != null) {
                         progress.onProgress(count.get(), "Done:");
                 }
@@ -658,4 +665,5 @@ public class Deobfuscator {
         public interface ClassTransformer {
                 String transform(ClassNode node, ClassWriter writer);
         }
+
 }