summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2007-09-06 13:01:17 +0000
committerPhilipp Haller <hallerp@gmail.com>2007-09-06 13:01:17 +0000
commit1ec3ba2ab4abe76f4bde5913b5407b8e810f9e8a (patch)
tree49945ab5a7d247ab634c4195af5a99360ff6cf72 /src/actors
parent4fdaad4888591939074e9c8d93069c1b2f0d6dde (diff)
downloadscala-1ec3ba2ab4abe76f4bde5913b5407b8e810f9e8a.tar.gz
scala-1ec3ba2ab4abe76f4bde5913b5407b8e810f9e8a.tar.bz2
scala-1ec3ba2ab4abe76f4bde5913b5407b8e810f9e8a.zip
Made constructor of FJTaskScheduler2 parameterl...
Made constructor of FJTaskScheduler2 parameterless again.
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/FJTaskScheduler2.scala6
-rw-r--r--src/actors/scala/actors/Scheduler.scala4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/actors/scala/actors/FJTaskScheduler2.scala b/src/actors/scala/actors/FJTaskScheduler2.scala
index c797279602..a7b63aa795 100644
--- a/src/actors/scala/actors/FJTaskScheduler2.scala
+++ b/src/actors/scala/actors/FJTaskScheduler2.scala
@@ -14,7 +14,7 @@ import scala.collection.mutable.{ArrayBuffer, Buffer, HashMap, Queue, Stack, Has
* @version 0.9.9
* @author Philipp Haller
*/
-class FJTaskScheduler2(core: Int, max: Int) extends Thread with IScheduler {
+class FJTaskScheduler2 extends Thread with IScheduler {
// as long as this thread runs, JVM should not exit
setDaemon(false)
@@ -26,11 +26,11 @@ class FJTaskScheduler2(core: Int, max: Int) extends Thread with IScheduler {
val initCoreSize =
if (null ne coreProp) Integer.parseInt(coreProp)
- else core
+ else 4
val maxSize =
if (null ne maxProp) Integer.parseInt(maxProp)
- else max
+ else 256
private var coreSize = initCoreSize
diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala
index 6c71841ef5..64478262ea 100644
--- a/src/actors/scala/actors/Scheduler.scala
+++ b/src/actors/scala/actors/Scheduler.scala
@@ -28,7 +28,7 @@ import scala.collection.mutable.{ArrayBuffer, Buffer, HashMap, Queue, Stack, Has
object Scheduler {
private var sched: IScheduler =
{
- var s: IScheduler = new FJTaskScheduler2(4, 256)
+ var s: IScheduler = new FJTaskScheduler2
s.start()
s
}
@@ -50,7 +50,7 @@ object Scheduler {
def restart(): Unit = synchronized {
sched = {
- var s: IScheduler = new FJTaskScheduler2(4, 256)
+ var s: IScheduler = new FJTaskScheduler2
s.asInstanceOf[FJTaskScheduler2].setPendingCount(pendingCount)
s.start()
s