diff options
author | michelou <michelou@epfl.ch> | 2007-05-10 17:00:34 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-05-10 17:00:34 +0000 |
commit | 48c9a76728c38b178d061bb6a282826a82cf77d3 (patch) | |
tree | 1876dceca682e70efd1abedff9a2677fbfbeffc1 /src/actors | |
parent | ae0a3254e1b666bb7363c35fc80c8d489282d9e6 (diff) | |
download | scala-48c9a76728c38b178d061bb6a282826a82cf77d3.tar.gz scala-48c9a76728c38b178d061bb6a282826a82cf77d3.tar.bz2 scala-48c9a76728c38b178d061bb6a282826a82cf77d3.zip |
</p/>
Diffstat (limited to 'src/actors')
-rw-r--r-- | src/actors/scala/actors/Debug.scala | 20 | ||||
-rw-r--r-- | src/actors/scala/actors/InputChannel.scala | 4 | ||||
-rw-r--r-- | src/actors/scala/actors/OutputChannel.scala | 4 | ||||
-rw-r--r-- | src/actors/scala/actors/remote/FreshNameCreator.scala | 10 | ||||
-rw-r--r-- | src/actors/scala/actors/remote/JavaSerializer.scala | 7 | ||||
-rw-r--r-- | src/actors/scala/actors/remote/NetKernel.scala | 19 | ||||
-rw-r--r-- | src/actors/scala/actors/remote/TcpService.scala | 12 |
7 files changed, 40 insertions, 36 deletions
diff --git a/src/actors/scala/actors/Debug.scala b/src/actors/scala/actors/Debug.scala index 9807f2b620..89efe5db62 100644 --- a/src/actors/scala/actors/Debug.scala +++ b/src/actors/scala/actors/Debug.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -14,33 +14,33 @@ package scala.actors * @author Philipp Haller */ object Debug { - var lev = 2 + private var lev = 2 def level = lev - def level_= (lev: int) = { - this.lev = lev - } + def level_= (lev: int) = { this.lev = lev } def info(s: String) = if (lev > 2) System.out.println("Info: " + s) + def warning(s: String) = if (lev > 1) System.err.println("Warning: " + s) + def error(s: String) = if (lev > 0) System.err.println("Error: " + s) } class Debug(tag: String) { - var lev = 2 + private var lev = 2 def level = lev - def level_= (lev: int) = { - this.lev = lev - } + def level_= (lev: int) = { this.lev = lev } def info(s: String) = if (lev > 2) System.out.println(tag + " (info): " + s) + def warning(s: String) = if (lev > 1) System.err.println(tag + " (warn): " + s) + def error(s: String) = if (lev > 0) System.err.println(tag + " (erro): " + s) } diff --git a/src/actors/scala/actors/InputChannel.scala b/src/actors/scala/actors/InputChannel.scala index 21ade395e6..ab1841cb83 100644 --- a/src/actors/scala/actors/InputChannel.scala +++ b/src/actors/scala/actors/InputChannel.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ diff --git a/src/actors/scala/actors/OutputChannel.scala b/src/actors/scala/actors/OutputChannel.scala index 978ea90a96..78fd193452 100644 --- a/src/actors/scala/actors/OutputChannel.scala +++ b/src/actors/scala/actors/OutputChannel.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ diff --git a/src/actors/scala/actors/remote/FreshNameCreator.scala b/src/actors/scala/actors/remote/FreshNameCreator.scala index b5d343c6a7..1ca6c16089 100644 --- a/src/actors/scala/actors/remote/FreshNameCreator.scala +++ b/src/actors/scala/actors/remote/FreshNameCreator.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -26,11 +26,11 @@ object FreshNameCreator { case None => 0 } counters.update(prefix, count) - new Symbol(prefix + count) + Symbol(prefix + count) } def newName(): Symbol = { - counter = counter + 1 - new Symbol("$" + counter + "$") + counter += 1 + Symbol("$" + counter + "$") } } diff --git a/src/actors/scala/actors/remote/JavaSerializer.scala b/src/actors/scala/actors/remote/JavaSerializer.scala index 80c9266c63..85d4952d90 100644 --- a/src/actors/scala/actors/remote/JavaSerializer.scala +++ b/src/actors/scala/actors/remote/JavaSerializer.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -13,6 +13,9 @@ package scala.actors.remote import java.io.{ByteArrayInputStream, ByteArrayOutputStream, ObjectInputStream, ObjectOutputStream} +/** + * @author Philipp Haller + */ class JavaSerializer(serv: Service) extends Serializer(serv) { def serialize(o: AnyRef): Array[Byte] = { diff --git a/src/actors/scala/actors/remote/NetKernel.scala b/src/actors/scala/actors/remote/NetKernel.scala index db622cc72f..45c7ae7c9e 100644 --- a/src/actors/scala/actors/remote/NetKernel.scala +++ b/src/actors/scala/actors/remote/NetKernel.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -14,6 +14,9 @@ import scala.collection.mutable.{HashMap, HashSet} case class NamedSend(senderName: Symbol, receiver: Symbol, data: Array[Byte]) +/** + * @author Philipp Haller + */ class NetKernel(service: Service) { def sendToNode(node: Node, msg: AnyRef) = { @@ -21,18 +24,17 @@ class NetKernel(service: Service) { service.send(node, bytes) } - def namedSend(node: Node, senderName: Symbol, receiver: Symbol, msg: AnyRef): Unit = { + def namedSend(node: Node, senderName: Symbol, receiver: Symbol, msg: AnyRef) { val bytes = service.serializer.serialize(msg) sendToNode(node, NamedSend(senderName, receiver, bytes)) } - def send(node: Node, name: Symbol, msg: AnyRef): Unit = { + def send(node: Node, name: Symbol, msg: AnyRef) { val senderName = names.get(Actor.self) match { - case None => { + case None => val freshName = FreshNameCreator.newName("remotesender") register(freshName, Actor.self) freshName - } case Some(name) => name } @@ -43,11 +45,11 @@ class NetKernel(service: Service) { msg match { case NamedSend(senderName, receiver, data) => actors.get(receiver) match { - case Some(a) => { + case Some(a) => val msg = service.serializer.deserialize(data) val senderProxy = new Actor { def act() = { a ! msg } - override def !(msg: Any): Unit = { + override def !(msg: Any) { msg match { case refmsg: AnyRef => namedSend(senderNode, receiver, senderName, refmsg) @@ -55,7 +57,6 @@ class NetKernel(service: Service) { } } senderProxy.start() - } case None => // message is lost } diff --git a/src/actors/scala/actors/remote/TcpService.scala b/src/actors/scala/actors/remote/TcpService.scala index d17f072ecc..a3721bc40d 100644 --- a/src/actors/scala/actors/remote/TcpService.scala +++ b/src/actors/scala/actors/remote/TcpService.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -53,12 +53,12 @@ class TcpService(port: Int) extends Thread with Service { def send(node: Node, data: Array[byte]): unit = synchronized { // retrieve worker thread (if any) that already has connection getConnection(node) match { - case None => { + case None => // we are not connected, yet val newWorker = connect(node) newWorker transmit data - } - case Some(worker) => worker transmit data + case Some(worker) => + worker transmit data } } @@ -172,7 +172,7 @@ class TcpServiceWorker(parent: TcpService, so: Socket) extends Thread { running = false } - override def run(): Unit = { + override def run() { try { while (running) { if (in.available() > 0) { |