diff options
author | Philipp Haller <hallerp@gmail.com> | 2007-01-10 10:07:08 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2007-01-10 10:07:08 +0000 |
commit | b6df86923f800794fc718b471bccde271af9fe96 (patch) | |
tree | 5c8bcfd57b16053b5e257c9b6d1813c74339abc4 | |
parent | 1828ef43100374982b6313ae94b885616ccf85a1 (diff) | |
download | scala-b6df86923f800794fc718b471bccde271af9fe96.tar.gz scala-b6df86923f800794fc718b471bccde271af9fe96.tar.bz2 scala-b6df86923f800794fc718b471bccde271af9fe96.zip |
Builds again
-rw-r--r-- | src/actors/scala/actors/Channel.scala | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/actors/scala/actors/Channel.scala b/src/actors/scala/actors/Channel.scala index 5b5318f615..89ee7e9473 100644 --- a/src/actors/scala/actors/Channel.scala +++ b/src/actors/scala/actors/Channel.scala @@ -47,55 +47,9 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { private[actors] var isSuspended = false - type WaitingPart = Tuple4[Msg=>boolean, // waitingFor - Option[Actor], // sender - Option[PartialFunction[Any, Unit]], - Option[Actor]] - var waitingParts: List[WaitingPart] = Nil - - var waitingPart: WaitingPart - - def waitingFor(msg: Msg, sender: Actor): boolean = { - waitingPart = waitingParts.find(p => p._1(msg) && - (if (!p._2.isEmpty) p._2.get == sender - else true)) - } - - def waitForNothing() = - waitingParts = Nil - - def resumeWaitingPart(msg: Msg, sender: Actor) = { - receiver.pushSender(sender) - waitingPart._3 match { - case Some(cont) => receiver.scheduleActor(cont, msg) - case None => // resume blocked thread - received = Some(msg) - p._4.get.resumeActor() - } - } - //private val messageQueue = new MessageQueue[Msg] private val mailbox = new scala.collection.mutable.Queue[Pair[Msg, Actor]] -/* - private def send(msg: Msg, sender: Actor) = receiver.synchronized { - receiver.tick() - if (waitingFor(msg, sender)) { - waitForNothing() - - if (receiver.timeoutPending) { - receiver.timeoutPending = false - TimerThread.trashRequest(receiver) - } - - resumeWaitingPart(msg, sender) - } else { - //messageQueue.append(msg, sender) - mailbox += Pair(msg, sender) - } - } -*/ - private def send(msg: Msg, sender: Actor) = receiver.synchronized { receiver.tick() if (waitingFor(msg) && ((waitingForSender eq null) || |