From 30ab8b6924972cba47f4d11ee7967ac7f4f468d0 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Tue, 21 Jul 2009 09:12:13 +0000 Subject: Moved new scheduler classes into package scala.... Moved new scheduler classes into package scala.actors.scheduler. --- src/actors/scala/actors/DaemonActor.scala | 2 ++ src/actors/scala/actors/DaemonScheduler.scala | 4 +++- src/actors/scala/actors/DefaultExecutorScheduler.scala | 2 +- src/actors/scala/actors/DelegatingScheduler.scala | 2 +- src/actors/scala/actors/DrainableForkJoinPool.scala | 2 +- src/actors/scala/actors/ExecutorScheduler.scala | 2 +- src/actors/scala/actors/FJTaskScheduler2.scala | 2 ++ src/actors/scala/actors/ForkJoinScheduler.scala | 2 +- src/actors/scala/actors/Future.scala | 2 ++ src/actors/scala/actors/Scheduler.scala | 1 + src/actors/scala/actors/SchedulerService.scala | 2 +- src/actors/scala/actors/SimpleExecutorScheduler.scala | 2 +- src/actors/scala/actors/SingleThreadedScheduler.scala | 2 +- src/actors/scala/actors/TerminationMonitor.scala | 2 +- src/actors/scala/actors/TerminationService.scala | 2 +- src/actors/scala/actors/ThreadPoolConfig.scala | 2 +- src/actors/scala/actors/ThreadPoolScheduler.scala | 5 ++--- test/files/jvm/daemon-actor-termination.scala | 3 ++- 18 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/actors/scala/actors/DaemonActor.scala b/src/actors/scala/actors/DaemonActor.scala index 7eee39a8e3..a81d2c8148 100644 --- a/src/actors/scala/actors/DaemonActor.scala +++ b/src/actors/scala/actors/DaemonActor.scala @@ -8,6 +8,8 @@ package scala.actors +import scheduler.DaemonScheduler + /** * Base trait for actors with daemon semantics. * Unlike a regular Actor, an active DaemonActor will diff --git a/src/actors/scala/actors/DaemonScheduler.scala b/src/actors/scala/actors/DaemonScheduler.scala index fe8dfbc1fe..ee4df16b47 100644 --- a/src/actors/scala/actors/DaemonScheduler.scala +++ b/src/actors/scala/actors/DaemonScheduler.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.actors +package scala.actors.scheduler /** * Default scheduler for actors with daemon semantics, such as those backing futures. @@ -14,5 +14,7 @@ package scala.actors * @author Erik Engbrecht */ object DaemonScheduler extends DelegatingScheduler { + def makeNewScheduler(): IScheduler = new DefaultExecutorScheduler(true) + } diff --git a/src/actors/scala/actors/DefaultExecutorScheduler.scala b/src/actors/scala/actors/DefaultExecutorScheduler.scala index 641425e0e0..afda4a91c0 100644 --- a/src/actors/scala/actors/DefaultExecutorScheduler.scala +++ b/src/actors/scala/actors/DefaultExecutorScheduler.scala @@ -8,7 +8,7 @@ // $Id$ -package scala.actors +package scala.actors.scheduler import java.util.concurrent.{ThreadPoolExecutor, TimeUnit, LinkedBlockingQueue, ThreadFactory} diff --git a/src/actors/scala/actors/DelegatingScheduler.scala b/src/actors/scala/actors/DelegatingScheduler.scala index fd8e932b05..21785ff2e4 100644 --- a/src/actors/scala/actors/DelegatingScheduler.scala +++ b/src/actors/scala/actors/DelegatingScheduler.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.actors +package scala.actors.scheduler /** * @author Erik Engbrecht diff --git a/src/actors/scala/actors/DrainableForkJoinPool.scala b/src/actors/scala/actors/DrainableForkJoinPool.scala index c1b25f1de4..994bac3dc2 100644 --- a/src/actors/scala/actors/DrainableForkJoinPool.scala +++ b/src/actors/scala/actors/DrainableForkJoinPool.scala @@ -1,4 +1,4 @@ -package scala.actors +package scala.actors.scheduler import java.util.Collection import forkjoin.{ForkJoinPool, ForkJoinTask} diff --git a/src/actors/scala/actors/ExecutorScheduler.scala b/src/actors/scala/actors/ExecutorScheduler.scala index 389b4507f0..2684b32228 100644 --- a/src/actors/scala/actors/ExecutorScheduler.scala +++ b/src/actors/scala/actors/ExecutorScheduler.scala @@ -8,7 +8,7 @@ // $Id$ -package scala.actors +package scala.actors.scheduler import java.util.concurrent.{ExecutorService, RejectedExecutionException} diff --git a/src/actors/scala/actors/FJTaskScheduler2.scala b/src/actors/scala/actors/FJTaskScheduler2.scala index 8bd4d176b6..e789e96be8 100644 --- a/src/actors/scala/actors/FJTaskScheduler2.scala +++ b/src/actors/scala/actors/FJTaskScheduler2.scala @@ -18,6 +18,8 @@ import java.lang.Thread.State import scala.collection.Set import scala.collection.mutable.{ArrayBuffer, Buffer, HashMap, Queue, Stack, HashSet} +import scheduler.{ThreadPoolConfig, QuitException} + /** * FJTaskScheduler2 * diff --git a/src/actors/scala/actors/ForkJoinScheduler.scala b/src/actors/scala/actors/ForkJoinScheduler.scala index 2c4a77bdd4..089a7639f2 100644 --- a/src/actors/scala/actors/ForkJoinScheduler.scala +++ b/src/actors/scala/actors/ForkJoinScheduler.scala @@ -1,4 +1,4 @@ -package scala.actors +package scala.actors.scheduler import java.lang.Thread.State import java.util.{Collection, ArrayList} diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala index 0487c02cfa..bc7ae1c402 100644 --- a/src/actors/scala/actors/Future.scala +++ b/src/actors/scala/actors/Future.scala @@ -10,6 +10,8 @@ package scala.actors +import scheduler.DefaultExecutorScheduler + /** *

* A Future[T] is a function of arity 0 that diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index d3dd27678b..cb764e963b 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -11,6 +11,7 @@ package scala.actors import java.util.concurrent._ +import scheduler.{DelegatingScheduler, ThreadPoolConfig, ThreadPoolScheduler, ForkJoinScheduler} /** * The Scheduler object is used by Actor to diff --git a/src/actors/scala/actors/SchedulerService.scala b/src/actors/scala/actors/SchedulerService.scala index 78abb97962..ac8c621074 100644 --- a/src/actors/scala/actors/SchedulerService.scala +++ b/src/actors/scala/actors/SchedulerService.scala @@ -8,7 +8,7 @@ // $Id: $ -package scala.actors +package scala.actors.scheduler import scala.util.control.ControlException import java.lang.{Runnable, Thread, InterruptedException} diff --git a/src/actors/scala/actors/SimpleExecutorScheduler.scala b/src/actors/scala/actors/SimpleExecutorScheduler.scala index 49f037971c..fdcc2cbd4d 100644 --- a/src/actors/scala/actors/SimpleExecutorScheduler.scala +++ b/src/actors/scala/actors/SimpleExecutorScheduler.scala @@ -8,7 +8,7 @@ // $Id$ -package scala.actors +package scala.actors.scheduler import java.util.concurrent.ExecutorService diff --git a/src/actors/scala/actors/SingleThreadedScheduler.scala b/src/actors/scala/actors/SingleThreadedScheduler.scala index b5f83b3416..b6de36b069 100644 --- a/src/actors/scala/actors/SingleThreadedScheduler.scala +++ b/src/actors/scala/actors/SingleThreadedScheduler.scala @@ -8,7 +8,7 @@ // $Id$ -package scala.actors +package scala.actors.scheduler /** * This scheduler executes the tasks of an actor on a single diff --git a/src/actors/scala/actors/TerminationMonitor.scala b/src/actors/scala/actors/TerminationMonitor.scala index 15fab26c3f..9437a9a168 100644 --- a/src/actors/scala/actors/TerminationMonitor.scala +++ b/src/actors/scala/actors/TerminationMonitor.scala @@ -8,7 +8,7 @@ // $Id:$ -package scala.actors +package scala.actors.scheduler import scala.collection.mutable.HashMap diff --git a/src/actors/scala/actors/TerminationService.scala b/src/actors/scala/actors/TerminationService.scala index 930967a67b..e3ee8971fc 100644 --- a/src/actors/scala/actors/TerminationService.scala +++ b/src/actors/scala/actors/TerminationService.scala @@ -8,7 +8,7 @@ // $Id: $ -package scala.actors +package scala.actors.scheduler import java.lang.{Runnable, Thread, InterruptedException} diff --git a/src/actors/scala/actors/ThreadPoolConfig.scala b/src/actors/scala/actors/ThreadPoolConfig.scala index 502ad4e13b..8a1075a652 100644 --- a/src/actors/scala/actors/ThreadPoolConfig.scala +++ b/src/actors/scala/actors/ThreadPoolConfig.scala @@ -8,7 +8,7 @@ // $Id$ -package scala.actors +package scala.actors.scheduler /** * @author Erik Engbrecht diff --git a/src/actors/scala/actors/ThreadPoolScheduler.scala b/src/actors/scala/actors/ThreadPoolScheduler.scala index dd694f24ff..568a045631 100644 --- a/src/actors/scala/actors/ThreadPoolScheduler.scala +++ b/src/actors/scala/actors/ThreadPoolScheduler.scala @@ -8,10 +8,9 @@ // $Id$ -package scala.actors +package scala.actors.scheduler -import scala.collection.mutable.HashMap -import java.util.concurrent.{ThreadPoolExecutor, RejectedExecutionException} +import java.util.concurrent.ThreadPoolExecutor /** * The ThreadPoolScheduler class uses an diff --git a/test/files/jvm/daemon-actor-termination.scala b/test/files/jvm/daemon-actor-termination.scala index b089f652bf..7707ea8d4d 100644 --- a/test/files/jvm/daemon-actor-termination.scala +++ b/test/files/jvm/daemon-actor-termination.scala @@ -1,4 +1,5 @@ -import scala.actors.{Actor, DefaultExecutorScheduler} +import scala.actors.Actor +import scala.actors.scheduler.DefaultExecutorScheduler /* Test that a daemon Actor that hasn't finished does not prevent termination */ -- cgit v1.2.3