diff options
author | Paul Phillips <paulp@improving.org> | 2012-04-09 16:43:54 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-04-09 16:43:54 -0700 |
commit | 54496744806e9617d8ab745122080c48f60c64e7 (patch) | |
tree | 49a6553549d01fa6df7c56f0b424461b90e46536 | |
parent | 7bddd73f6e18bde931026abf5fe2526b747727ad (diff) | |
parent | 14fbad93cb212466440b92a286dab6d13fb6d09e (diff) | |
download | scala-54496744806e9617d8ab745122080c48f60c64e7.tar.gz scala-54496744806e9617d8ab745122080c48f60c64e7.tar.bz2 scala-54496744806e9617d8ab745122080c48f60c64e7.zip |
Merge commit 'refs/pull/364/head' into develop
-rw-r--r-- | test/files/presentation/memory-leaks.check | 40 | ||||
-rw-r--r-- | test/files/presentation/memory-leaks/MemoryLeaksTest.scala | 21 |
2 files changed, 51 insertions, 10 deletions
diff --git a/test/files/presentation/memory-leaks.check b/test/files/presentation/memory-leaks.check index 9d8cbb4da4..86fb07757d 100644 --- a/test/files/presentation/memory-leaks.check +++ b/test/files/presentation/memory-leaks.check @@ -11,4 +11,44 @@ reload: Typers.scala reload: Typers.scala reload: Typers.scala reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala +reload: Typers.scala No leaks detected. diff --git a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala index e24f36d7b6..45b38da85b 100644 --- a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala +++ b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala @@ -33,7 +33,7 @@ object Test extends InteractiveTest { new BatchSourceFile(AbstractFile.getFile(name)) def memoryConsumptionTest() { - val N = 10 + val N = 50 val filename = "usedmem-%tF.txt".format(Calendar.getInstance.getTime) val typerUnit = AbstractFile.getFile(baseDir.parent.parent.parent.parent / "src/compiler/scala/tools/nsc/typechecker/Typers.scala") @@ -56,18 +56,10 @@ object Test extends InteractiveTest { typeCheckWith(typerUnit, src) } -// println("UsedMem:\t%d\t%d".format(i, usedMem / mega)) usedMem / mega // report size in MB } - - // println("=" * 80) - val outputFile = new PrintWriter(new FileOutputStream(filename)) - outputFile.println("\tusedMem") - for ((dataPoint, i) <- usedMem.zipWithIndex) { - outputFile.println("%d\t%d".format(i, dataPoint)) - } - outputFile.close() + //dumpDataToFile(filename, usedMem) // drop the first two measurements, since the compiler needs some memory when initializing val (a, b) = linearModel((3L to N).toSeq, usedMem.drop(2)) //println("LinearModel: constant: %.4f\tslope:%.4f".format(a, b)) @@ -83,6 +75,15 @@ object Test extends InteractiveTest { askReload(Seq(sourceFile)) askLoadedTyped(sourceFile).get // block until it's here } + + private def dumpDataToFile(filename: String, usedMem: Seq[Long]) { + val outputFile = new PrintWriter(new FileOutputStream(filename)) + outputFile.println("\tusedMem") + for ((dataPoint, i) <- usedMem.zipWithIndex) { + outputFile.println("%d\t%d".format(i, dataPoint)) + } + outputFile.close() + } /** Return the linear model of these values, (a, b). First value is the constant factor, |