Merge branch 'work'

Conflicts:
	src/library/scala/concurrent/SyncVar.scala

1 files changed, 18 insertions, 0 deletions

diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala
index cf0e53e47d..bdb1dff56d 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala
@@ -57,6 +57,21 @@ trait ParHashTableBenches[K, V] extends StandardParIterableBenches[(K, V), ParHa
     }
   }
 
+  object FlatMap2 extends IterableBenchCompanion {
+    override def defaultSize = 5000
+    def benchName = "flatmap2";
+    def apply(sz: Int, p: Int, w: String) = new FlatMap2(sz, p, w)
+  }
+
+  class FlatMap2(val size: Int, val parallelism: Int, val runWhat: String)
+  extends IterableBench {
+    def comparisonMap = collection.Map()
+    override def repetitionsPerRun = 25
+    def runseq = this.seqcoll.flatMap(operators.flatmapper)
+    def runpar = this.parcoll.flatMap(operators.flatmapper)
+    def companion = FlatMap2
+  }
+
   object HeavyMap extends IterableBenchCompanion {
     override def defaultSize = 5000
     override def comparisons = List()
@@ -177,6 +192,9 @@ object RefParHashTableBenches extends ParHashTableBenches[Dummy, Dummy] {
       a.num = a.in % 2
       (a, p._2)
     }
+    val flatmapper = (p: DPair) => {
+      for (i <- 0 until 20) yield p
+    }
     override val mapper2 = (p: DPair) => {
       val a = 1 //heavy(p._1.in)
       (new Dummy(p._1.in * -2 + a), p._2)