raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Switching to using OrderedMemoryAware executor same for all of the remoting, added more remote config tests and switched to mem size conf

Browse source
This commit is contained in:
Viktor Klang 2011-12-30 12:04:20 +01:00
parent 88d2427b7f
commit 5d2bd2492f
7 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
View file

@ -54,7 +54,7 @@ class RemoteActorRefProvider(
local.init(system)
remote.init(system, this)
local.registerExtraNames(Map(("remote", remote.remoteDaemon)))
terminationFuture.onComplete(_ ⇒ remote.server.shutdown())
terminationFuture.onComplete(_ ⇒ remote.transport.shutdown())
}
def actorOf(system: ActorSystemImpl, props: Props, supervisor: InternalActorRef, path: ActorPath, systemService: Boolean, deploy: Option[Deploy]): InternalActorRef = {
@ -114,7 +114,7 @@ class RemoteActorRefProvider(
else {
val rpath = RootActorPath(addr) / "remote" / rootPath.address.hostPort / path.elements
useActorOnNode(rpath, props.creator, supervisor)
new RemoteActorRef(this, remote.server, rpath, supervisor, None)
new RemoteActorRef(this, remote.transport, rpath, supervisor, None)
}
}
@ -125,14 +125,14 @@ class RemoteActorRefProvider(
def actorFor(path: ActorPath): InternalActorRef = path.root match {
case `rootPath` ⇒ actorFor(rootGuardian, path.elements)
case RootActorPath(_: RemoteSystemAddress[_], _) ⇒ new RemoteActorRef(this, remote.server, path, Nobody, None)
case RootActorPath(_: RemoteSystemAddress[_], _) ⇒ new RemoteActorRef(this, remote.transport, path, Nobody, None)
case _ ⇒ local.actorFor(path)
}
def actorFor(ref: InternalActorRef, path: String): InternalActorRef = path match {
case ParsedActorPath(address, elems) ⇒
if (address == rootPath.address) actorFor(rootGuardian, elems)
else new RemoteActorRef(this, remote.server, new RootActorPath(address) / elems, Nobody, None)
else new RemoteActorRef(this, remote.transport, new RootActorPath(address) / elems, Nobody, None)
case _ ⇒ local.actorFor(ref, path)
}