Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 34 insertions, 0 deletions

diff --git a/test/benchmarking/ParCtrie-size.scala b/test/benchmarking/ParCtrie-size.scala
new file mode 100644
index 0000000000..5a6191fb62
--- /dev/null
+++ b/test/benchmarking/ParCtrie-size.scala
@@ -0,0 +1,34 @@
+
+
+
+
+import collection.parallel.mutable.ParCtrie
+
+
+
+object Size extends testing.Benchmark {
+  val length = sys.props("length").toInt
+  val par = sys.props("par").toInt
+  var parctrie = ParCtrie((0 until length) zip (0 until length): _*)
+  
+  collection.parallel.ForkJoinTasks.defaultForkJoinPool.setParallelism(par)
+  
+  def run = {
+    parctrie.size
+  }
+  
+  var iteration = 0
+  
+  override def tearDown() {
+    iteration += 1
+    if (iteration % 4 == 0) parctrie = ParCtrie((0 until length) zip (0 until length): _*)
+  }
+  
+}
+
+
+
+
+
+
+