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

Minor code cleanup

Browse source
This commit is contained in:
Viktor Klang 2011-01-01 22:20:43 +01:00
parent f679dd06ab
commit d5095be95d
2 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

48
akka-remote/src/main/scala/akka/remote/NettyRemoteSupport.scala
View file

@ -31,7 +31,6 @@ import org.jboss.netty.handler.ssl.SslHandler
import java.net.{ SocketAddress, InetSocketAddress }
import java.util.concurrent.{ TimeUnit, Executors, ConcurrentMap, ConcurrentHashMap, ConcurrentSkipListSet }
import java.util.concurrent.locks.ReentrantReadWriteLock
import scala.collection.mutable.{ HashSet, HashMap }
import scala.reflect.BeanProperty
import java.lang.reflect.InvocationTargetException
@ -52,7 +51,7 @@ trait NettyRemoteShared {
trait NettyRemoteClientModule extends RemoteClientModule with NettyRemoteShared { self: ListenerManagement with Logging =>
private val remoteClients = new HashMap[String, RemoteClient]
private val remoteActors = new Index[Address, Uuid]
private val lock = new ReentrantReadWriteLock
private val lock = new ReadWriteGuard
protected[akka] def typedActorFor[T](intfClass: Class[T], serviceId: String, implClassName: String, timeout: Long, hostname: String, port: Int, loader: Option[ClassLoader]): T =
TypedActor.createProxyForRemoteActorRef(intfClass, RemoteActorRef(serviceId, implClassName, hostname, port, timeout, loader, AkkaActorType.TypedActor))
@ -148,43 +147,27 @@ trait NettyRemoteClientModule extends RemoteClientModule with NettyRemoteShared
case address => address.getHostName + ':' + address.getPort
}
def shutdownClientConnection(address: InetSocketAddress): Boolean = {
lock.writeLock.lock
try {
remoteClients.remove(makeKey(address)) match {
case Some(client) => client.shutdown
case None => false
}
} finally {
lock.writeLock.unlock
def shutdownClientConnection(address: InetSocketAddress): Boolean = lock withWriteGuard {
remoteClients.remove(makeKey(address)) match {
case Some(client) => client.shutdown
case None => false
}
}
def restartClientConnection(address: InetSocketAddress): Boolean = {
lock.readLock.lock
try {
remoteClients.get(makeKey(address)) match {
case Some(client) => client.connect(reconnectIfAlreadyConnected = true)
case None => false
}
} finally {
lock.readLock.unlock
def restartClientConnection(address: InetSocketAddress): Boolean = lock withReadGuard {
remoteClients.get(makeKey(address)) match {
case Some(client) => client.connect(reconnectIfAlreadyConnected = true)
case None => false
}
}
private[akka] def registerSupervisorForActor(actorRef: ActorRef): ActorRef =
clientFor(actorRef.homeAddress.get, None).registerSupervisorForActor(actorRef)
private[akka] def deregisterSupervisorForActor(actorRef: ActorRef): ActorRef = {
val key = makeKey(actorRef.homeAddress.get)
lock.readLock.lock //TODO: perhaps use writelock here
try {
remoteClients.get(key) match {
case Some(client) => client.deregisterSupervisorForActor(actorRef)
case None => actorRef
}
} finally {
lock.readLock.unlock
private[akka] def deregisterSupervisorForActor(actorRef: ActorRef): ActorRef = lock withReadGuard {
remoteClients.get(makeKey(actorRef.homeAddress.get)) match {
case Some(client) => client.deregisterSupervisorForActor(actorRef)
case None => actorRef
}
}
@ -197,12 +180,9 @@ trait NettyRemoteClientModule extends RemoteClientModule with NettyRemoteShared
//remoteActors.clear
}
def shutdownRemoteClients = try {
lock.writeLock.lock
def shutdownRemoteClients = lock withWriteGuard {
remoteClients.foreach({ case (addr, client) => client.shutdown })
remoteClients.clear
} finally {
lock.writeLock.unlock
}
def registerClientManagedActor(hostname: String, port: Int, uuid: Uuid) = {