From 3d68d5e3deeb359d78d7911d8eac974d4f802d1d Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Thu, 27 Jun 2013 06:30:33 +1000 Subject: [PATCH] Added some more debug logging and monitoring --- .../multipart/asm/ASMMixinCompiler.scala | 33 +++++++++++++++---- .../multipart/asm/ASMMixinFactory.scala | 6 +++- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/codechicken/multipart/asm/ASMMixinCompiler.scala b/codechicken/multipart/asm/ASMMixinCompiler.scala index b972492..52cca9e 100644 --- a/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -22,20 +22,38 @@ import java.lang.reflect.Modifier object DebugPrinter { + def debug = !obfuscated + + private var permGenUsed = 0 val dir = new File("asm/multipart") - if(!dir.exists) - dir.mkdirs() - for(file <- dir.listFiles) - file.delete - - def defined(name:String, bytes:Array[Byte]) + if(debug) { + if(!dir.exists) + dir.mkdirs() + for(file <- dir.listFiles) + file.delete + } + + def dump(name:String, bytes:Array[Byte]) + { + if(!debug) return + val fileout = new File(dir, name.replace('/', '#')+".txt") val pout = new PrintWriter(fileout) new ClassReader(bytes).accept(new TraceClassVisitor(null, new Textifier(), pout), 0) pout.close() } + + def defined(name:String, bytes:Array[Byte]) + { + if((permGenUsed+bytes.length)/16000 != permGenUsed/16000) + log((permGenUsed+bytes.length)+" bytes of permGen has been used by ASMMixinCompiler"); + + permGenUsed += bytes.length + } + + def log(msg:String) = if(debug) println(msg) } object ASMMixinCompiler @@ -50,6 +68,7 @@ object ASMMixinCompiler def define(name:String, bytes:Array[Byte]) = { internalDefine(name, bytes) + DebugPrinter.defined(name, bytes) m_defineClass.invoke(cl, bytes, 0:Integer, bytes.length:Integer).asInstanceOf[Class[_]] } @@ -57,7 +76,7 @@ object ASMMixinCompiler { traitByteMap.put(name.replace('.', '/'), bytes) BaseNodeInfo.clear(name) - DebugPrinter.defined(name, bytes) + DebugPrinter.dump(name, bytes) } def classNode(name:String) = traitByteMap.getOrElseUpdate(name.replace('.', '/'), cl.getClassBytes(name.replace('/', '.'))) match { diff --git a/codechicken/multipart/asm/ASMMixinFactory.scala b/codechicken/multipart/asm/ASMMixinFactory.scala index 4358160..25740b7 100644 --- a/codechicken/multipart/asm/ASMMixinFactory.scala +++ b/codechicken/multipart/asm/ASMMixinFactory.scala @@ -81,13 +81,17 @@ object ASMMixinFactory extends IMultipartFactory def generator():Constructor = { + val startTime = System.currentTimeMillis + val cmpClass = if(!types.isEmpty) mixinClasses(uniqueName("TileMultipart_cmp"), set.head, set.drop(1)) else cl.loadClass(baseType) MultipartGenerator.registerTileClass(cmpClass.asInstanceOf[TMClass], types.toSet) - return constructor(cmpClass) + val c = constructor(cmpClass) + DebugPrinter.log("Generation ["+types.mkString(", ")+"] took: "+(System.currentTimeMillis-startTime)) + return c } }