diff options
| -rwxr-xr-x | cbt | 4 | ||||
| -rw-r--r-- | nailgun_launcher/NailgunLauncher.java | 4 | ||||
| -rw-r--r-- | stage1/logger.scala | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -184,7 +184,7 @@ stage1 () { then log "Running JVM directly" $* # -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=localhost:5005 - java -cp $NAILGUN$TARGET cbt.NailgunLauncher "$CWD" $* + java -Xmx6072m -Xss10M -cp $NAILGUN$TARGET cbt.NailgunLauncher $(time_taken) "$CWD" $* else log "Running via nailgun." $* for i in 0 1 2 3 4 5 6 7 8 9; do @@ -207,7 +207,7 @@ stage1 () { sleep 0.3 done log "Running CBT via Nailgun." $* - $NG cbt.NailgunLauncher "$CWD" $* + $NG cbt.NailgunLauncher $(time_taken) "$CWD" $* fi exitCode=$? log "Done running CBT." $* diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java index a12d059..d3c7825 100644 --- a/nailgun_launcher/NailgunLauncher.java +++ b/nailgun_launcher/NailgunLauncher.java @@ -44,7 +44,6 @@ public class NailgunLauncher{ MalformedURLException, IOException, NoSuchAlgorithmException { - long start = System.currentTimeMillis(); //System.err.println("ClassLoader: "+stage1classLoader); //System.err.println("lastSuccessfullCompile: "+lastSuccessfullCompile); //System.err.println("now: "+now); @@ -54,11 +53,14 @@ public class NailgunLauncher{ _assert(TARGET != null, TARGET); _assert(STAGE1 != null, STAGE1); + Long _start = System.currentTimeMillis(); if(args[0].equals("check-alive")){ System.exit(33); return; } + String[] diff = args[0].split("\\."); + long start = _start - (Long.parseLong(diff[0]) * 1000L) - Long.parseLong(diff[1]); List<File> stage1SourceFiles = new ArrayList<File>(); for( File f: new File(STAGE1).listFiles() ){ if( f.isFile() && f.toString().endsWith(".scala") ){ diff --git a/stage1/logger.scala b/stage1/logger.scala index c21dc86..1e0a693 100644 --- a/stage1/logger.scala +++ b/stage1/logger.scala @@ -12,7 +12,7 @@ case class Logger(enabledLoggers: Set[String], start: Long) { def log(name: String, msg: => String) = { val timeTaken = ((System.currentTimeMillis.toDouble - start) / 1000).toString - System.err.println( s"[${" "*(6-timeTaken.size)}$timeTaken][$name] $msg" ) + System.err.println( s"[$timeTaken][$name] $msg" ) } def showInvocation(method: String, args: Any) = method ++ "( " ++ args.toString ++ " )" |