From 7e0b9e8effaebbb6413e4cc63789b8f86428a684 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Fri, 13 Jul 2012 18:16:31 +0200 Subject: Changing to scala.concurrent.context. as namespace for the system properties for the global execution context --- src/library/scala/concurrent/impl/ExecutionContextImpl.scala | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala index 6c4145e2d5..98f821652f 100644 --- a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala +++ b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala @@ -59,15 +59,14 @@ private[scala] class ExecutionContextImpl private[impl] (es: Executor, reporter: def range(floor: Int, desired: Int, ceiling: Int): Int = if (ceiling < floor) range(ceiling, desired, floor) else scala.math.min(scala.math.max(desired, floor), ceiling) - val minThreads = getInt("scala.concurrent.ec.minThreads", _.toInt) - val maxThreads = getInt("scala.concurrent.ec.maxThreads", _.toInt) - val numThreads = getInt("scala.concurrent.ec.numThreads", { + val desiredParallelism = range( + getInt("scala.concurrent.context.minThreads", _.toInt), + getInt("scala.concurrent.context.numThreads", { case null | "" => Runtime.getRuntime.availableProcessors case s if s.charAt(0) == 'x' => (Runtime.getRuntime.availableProcessors * s.substring(1).toDouble).ceil.toInt case other => other.toInt - }) - - val desiredParallelism = range(minThreads, numThreads, maxThreads) + }), + getInt("scala.concurrent.context.maxThreads", _.toInt)) val threadFactory = new DefaultThreadFactory(daemonic = true) -- cgit v1.2.3