diff options
author | Philipp Haller <hallerp@gmail.com> | 2008-02-04 13:48:15 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2008-02-04 13:48:15 +0000 |
commit | 83641e762f4c72d495dec904e79bafbef22b09fd (patch) | |
tree | 1a5d8c81fda7efc162738d30dd6bd1eb16c154de | |
parent | 5295a1a8caa8b67e9492ad2882d857ff899eb527 (diff) | |
download | scala-83641e762f4c72d495dec904e79bafbef22b09fd.tar.gz scala-83641e762f4c72d495dec904e79bafbef22b09fd.tar.bz2 scala-83641e762f4c72d495dec904e79bafbef22b09fd.zip |
Fixed #437
-rw-r--r-- | src/actors/scala/actors/FJTaskScheduler2.scala | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/src/actors/scala/actors/FJTaskScheduler2.scala b/src/actors/scala/actors/FJTaskScheduler2.scala index 382aee5f54..934ccefaa8 100644 --- a/src/actors/scala/actors/FJTaskScheduler2.scala +++ b/src/actors/scala/actors/FJTaskScheduler2.scala @@ -17,12 +17,12 @@ import java.lang.{Runnable, Thread, InterruptedException, System, Runtime} import scala.collection.Set import scala.collection.mutable.{ArrayBuffer, Buffer, HashMap, Queue, Stack, HashSet} -import scala.ref._ +import java.lang.ref.{WeakReference, ReferenceQueue} /** * FJTaskScheduler2 * - * @version 0.9.11 + * @version 0.9.12 * @author Philipp Haller */ class FJTaskScheduler2 extends Thread with IScheduler { @@ -121,27 +121,16 @@ class FJTaskScheduler2 extends Thread with IScheduler { if (!suspending) { - // check whether some actors have become - // unreachable - /*def drainRefQ: Unit = - refQ.poll match { - case None => - // do nothing - case refWrapper => - refWrapper.get match { - case None => - // can't get hold of the actor - // count down anyways - unPendReaction - // continue draining - drainRefQ - case Some(a) => - Debug.info(this+": actor is unreachable: "+a) - unPendReaction - // continue draining - drainRefQ - } - }*/ + // check for unreachable actors + def drainRefQ() { + val wr = refQ.poll + if (wr != null) { + unPendReaction + // continue draining + drainRefQ() + } + } + drainRefQ() // check if we need more threads if (Platform.currentTime - lastActivity >= TICK_FREQ @@ -186,14 +175,16 @@ class FJTaskScheduler2 extends Thread with IScheduler { executor.execute(task) } - //private val refQ = new ReferenceQueue[Actor] - //private var storedRefs: List[WeakReference[Actor]] = List() + private val refQ = new ReferenceQueue[Actor] + private var storedRefs: List[WeakReference[Actor]] = List() def start(task: Runnable) { - /*if (task.isInstanceOf[Reaction]) { + if (task.isInstanceOf[Reaction]) { val reaction = task.asInstanceOf[Reaction] - storedRefs = new WeakReference(reaction.a, refQ) :: storedRefs - }*/ + val wr = new WeakReference[Actor](reaction.a, refQ) + //Debug.info("created "+wr+" pointing to "+reaction.a) + storedRefs = wr :: storedRefs + } pendReaction executor.execute(task) } |