Merge pull request scala#870 from paulp/topic/partest-no-actors

faster partest

Author: Adriaan Moors

src/partest/scala/tools/partest/PartestDefaults.scala

@@ -4,6 +4,7 @@ package partest
 import nsc.io.{ File, Path, Directory }
 import util.{ PathResolver }
 import nsc.Properties.{ propOrElse, propOrNone, propOrEmpty }
+import java.lang.Runtime.getRuntime
 
 object PartestDefaults {
   import nsc.Properties._
@@ -22,10 +23,9 @@ object PartestDefaults {
   def javaOpts    = propOrElse("partest.java_opts", "")
   def scalacOpts  = propOrElse("partest.scalac_opts", "-deprecation")
 
-  def testBuild   = propOrNone("partest.build")
-  def errorCount  = propOrElse("partest.errors", "0").toInt
-  def numActors   = propOrElse("partest.actors", "6").toInt
-  def poolSize    = wrapAccessControl(propOrNone("actors.corePoolSize"))
+  def testBuild  = propOrNone("partest.build")
+  def errorCount = propOrElse("partest.errors", "0").toInt
+  def numThreads = propOrNone("partest.threads") map (_.toInt) getOrElse getRuntime.availableProcessors
 
   def timeout     = "1200000"
 }

src/partest/scala/tools/partest/PartestTask.scala

@@ -9,7 +9,6 @@
 package scala.tools
 package partest
 
-import scala.actors.Actor._
 import scala.util.Properties.setProp
 import scala.tools.nsc.io.{ Directory, Path => SPath }
 import nsc.util.ClassPath
@@ -385,12 +384,12 @@ class PartestTask extends Task with CompilationPathProperty {
       if (files.isEmpty) (0, 0, List())
       else {
         log(msg)
-        val results: Iterable[(String, Int)] = antRunner.reflectiveRunTestsForFiles(files, name)
+        val results: Iterable[(String, TestState)] = antRunner.reflectiveRunTestsForFiles(files, name)
         val (succs, fails) = resultsToStatistics(results)
 
         val failed: Iterable[String] = results collect {
-          case (path, 1)    => path + " [FAILED]"
-          case (path, 2)    => path + " [TIMOUT]"
+          case (path, TestState.Fail)    => path + " [FAILED]"
+          case (path, TestState.Timeout) => path + " [TIMOUT]"
         }
 
         // create JUnit Report xml files if directory was specified
@@ -422,16 +421,16 @@ class PartestTask extends Task with CompilationPathProperty {
     f(msg)
   }
 
-  private def oneResult(res: (String, Int)) =
+  private def oneResult(res: (String, TestState)) =
     <testcase name={res._1}>{
       res._2 match {
-        case 0 => scala.xml.NodeSeq.Empty
-        case 1 => <failure message="Test failed"/>
-        case 2 => <failure message="Test timed out"/>
+        case TestState.Ok      => scala.xml.NodeSeq.Empty
+        case TestState.Fail    => <failure message="Test failed"/>
+        case TestState.Timeout => <failure message="Test timed out"/>
       }
     }</testcase>
 
-  private def testReport(kind: String, results: Iterable[(String, Int)], succs: Int, fails: Int) =
+  private def testReport(kind: String, results: Iterable[(String, TestState)], succs: Int, fails: Int) =
     <testsuite name={kind} tests={(succs + fails).toString} failures={fails.toString}>
       <properties/>
       {

src/partest/scala/tools/partest/nest/ConsoleRunner.scala

@@ -16,6 +16,7 @@ import scala.tools.nsc.Properties.{ versionMsg, setProp }
 import scala.tools.nsc.util.CommandLineParser
 import scala.tools.nsc.io
 import io.{ Path }
+import scala.collection.{ mutable, immutable }
 
 class ConsoleRunner extends DirectRunner {
   import PathSettings.{ srcDir, testRoot }
@@ -105,8 +106,6 @@ class ConsoleRunner extends DirectRunner {
     if (parsed isSet "--timeout") fileManager.timeout = parsed("--timeout")
     if (parsed isSet "--debug") setProp("partest.debug", "true")
 
-    setProperties() // must be done after processing command line arguments such as --debug
-
     def addTestFile(file: File) = {
       if (!file.exists)
         NestUI.failure("Test file '%s' not found, skipping.\n" format file)
@@ -171,13 +170,10 @@ class ConsoleRunner extends DirectRunner {
     if (grepMessage != "")
       NestUI.normal(grepMessage + "\n")
 
-    val start = System.currentTimeMillis
-    val (successes, failures) = testCheckAll(enabledTestSets)
-    val end = System.currentTimeMillis
-
+    val ((successes, failures), elapsedMillis) = timed(testCheckAll(enabledTestSets))
     val total = successes + failures
 
-    val elapsedSecs = (end - start)/1000
+    val elapsedSecs = elapsedMillis/1000
     val elapsedMins = elapsedSecs/60
     val elapsedHrs  = elapsedMins/60
     val dispMins = elapsedMins - elapsedHrs  * 60
@@ -188,7 +184,6 @@ class ConsoleRunner extends DirectRunner {
       form(elapsedHrs)+":"+form(dispMins)+":"+form(dispSecs)
     }
 
-    println
     if (failures == 0)
       NestUI.success("All of "+total+" tests were successful (elapsed time: "+dispElapsed+")\n")
     else

src/partest/scala/tools/partest/nest/DirectRunner.scala

@@ -13,16 +13,15 @@ import scala.util.Properties.setProp
 import scala.tools.nsc.util.ScalaClassLoader
 import scala.tools.nsc.io.Path
 import scala.collection.{ mutable, immutable }
-import scala.actors.Actor._
-import scala.actors.TIMEOUT
+import java.util.concurrent._
+import scala.collection.convert.decorateAll._
 
 case class TestRunParams(val scalaCheckParentClassLoader: ScalaClassLoader)
 
 trait DirectRunner {
-
   def fileManager: FileManager
 
-  import PartestDefaults.numActors
+  import PartestDefaults.numThreads
 
   def denotesTestFile(arg: String) = Path(arg).hasExtension("scala", "res", "xml")
   def denotesTestDir(arg: String)  = Path(arg).ifDirectory(_.files.nonEmpty) exists (x => x)
@@ -37,53 +36,34 @@ trait DirectRunner {
       false
     })
   }
-
-  def setProperties() {
-    if (isPartestDebug)
-      scala.actors.Debug.level = 3
-
-    if (PartestDefaults.poolSize.isEmpty) {
-      scala.actors.Debug.info("actors.corePoolSize not defined")
-      setProp("actors.corePoolSize", "12")
-    }
-  }
-
-  def runTestsForFiles(_kindFiles: List[File], kind: String): immutable.Map[String, Int] = {
-    val kindFiles = onlyValidTestPaths(_kindFiles)
-    val groupSize = (kindFiles.length / numActors) + 1
-
+  def runTestsForFiles(_kindFiles: List[File], kind: String): immutable.Map[String, TestState] = {
     // @partest maintainer: we cannot create a fresh file manager here
     // since the FM must respect --buildpath and --classpath from the command line
     // for example, see how it's done in ReflectiveRunner
     //val consFM = new ConsoleFileManager
     //import consFM.{ latestCompFile, latestLibFile, latestPartestFile }
-    val latestCompFile = new File(fileManager.LATEST_COMP)
+    val latestCompFile    = new File(fileManager.LATEST_COMP)
     val latestReflectFile = new File(fileManager.LATEST_REFLECT)
-    val latestLibFile = new File(fileManager.LATEST_LIB)
+    val latestLibFile     = new File(fileManager.LATEST_LIB)
     val latestPartestFile = new File(fileManager.LATEST_PARTEST)
-    val latestActorsFile = new File(fileManager.LATEST_ACTORS)
-    val latestActMigFile = new File(fileManager.LATEST_ACTORS_MIGRATION)
-    val scalacheckURL = PathSettings.scalaCheck.toURL
+    val latestActorsFile  = new File(fileManager.LATEST_ACTORS)
+    val latestActMigFile  = new File(fileManager.LATEST_ACTORS_MIGRATION)
+    val scalacheckURL     = PathSettings.scalaCheck.toURL
     val scalaCheckParentClassLoader = ScalaClassLoader.fromURLs(
       scalacheckURL :: (List(latestCompFile, latestReflectFile, latestLibFile, latestActorsFile, latestActMigFile, latestPartestFile).map(_.toURI.toURL))
     )
-    Output.init()
 
-    val workers = kindFiles.grouped(groupSize).toList map { toTest =>
-      val worker = new Worker(fileManager, TestRunParams(scalaCheckParentClassLoader))
-      worker.start()
-      worker ! RunTests(kind, toTest)
-      worker
-    }
+    val kindFiles = onlyValidTestPaths(_kindFiles)
+    val pool      = Executors.newFixedThreadPool(numThreads)
+    val manager   = new RunnerManager(kind, fileManager, TestRunParams(scalaCheckParentClassLoader))
+    val futures   = kindFiles map (f => (f, pool submit callable(manager runTest f))) toMap
+
+    pool.shutdown()
+    pool.awaitTermination(1, TimeUnit.HOURS)
 
-    workers map { w =>
-      receiveWithin(3600 * 1000) {
-        case Results(testResults) => testResults
-        case TIMEOUT =>
-          // add at least one failure
-          NestUI.verbose("worker timed out; adding failed test")
-          Map("worker timed out; adding failed test" -> 2)
-      }
-    } reduceLeft (_ ++ _)
+    for ((file, future) <- futures) yield {
+      val state = if (future.isCancelled) TestState.Timeout else future.get
+      (file.getAbsolutePath, state)
+    }
   }
 }