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

Fixing FIXME to rename isShutdown to isTerminated

Browse source
This commit is contained in:
Viktor Klang 2011-11-23 19:03:56 +01:00
parent 7d9a124b64
commit c56341b3a6
17 changed files with 45 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala
View file

@ -80,11 +80,11 @@ class ActorFireForgetRequestReplySpec extends AkkaSpec with BeforeAndAfterEach {
filterEvents(EventFilter[Exception]("Expected exception")) {
val supervisor = actorOf(Props[Supervisor].withFaultHandler(OneForOneStrategy(List(classOf[Exception]), Some(0))))
val actor = (supervisor ? Props[CrashingActor]).as[ActorRef].get
actor.isShutdown must be(false)
actor.isTerminated must be(false)
actor ! "Die"
state.finished.await
1.second.dilated.sleep()
actor.isShutdown must be(true)
actor.isTerminated must be(true)
supervisor.stop()
}
}

2
akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
View file

@ -364,7 +364,7 @@ class ActorRefSpec extends AkkaSpec {
ffive.get must be("five")
fnull.get must be("null")
awaitCond(ref.isShutdown, 2000 millis)
awaitCond(ref.isTerminated, 2000 millis)
}
"restart when Kill:ed" in {

4
akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala
View file

@ -96,7 +96,7 @@ class DeathWatchSpec extends AkkaSpec with BeforeAndAfterEach with ImplicitSende
terminal ! Kill
expectTerminationOf(terminal)
terminal.isShutdown must be === true
terminal.isTerminated must be === true
supervisor.stop()
}
@ -123,7 +123,7 @@ class DeathWatchSpec extends AkkaSpec with BeforeAndAfterEach with ImplicitSende
case FF(Failed(DeathPactException(`failed`))) if lastSender eq brother ⇒ 2
case Terminated(`brother`) ⇒ 3
}
testActor must not be 'shutdown
testActor.isTerminated must not be true
result must be(Seq(1, 2, 3))
}
}

2
akka-actor-tests/src/test/scala/akka/actor/LoggingReceiveSpec.scala
View file

@ -129,7 +129,7 @@ class LoggingReceiveSpec extends WordSpec with BeforeAndAfterEach with BeforeAnd
expectMsgPF() {
case Logging.Debug(`name`, msg: String) if msg startsWith "received AutoReceiveMessage Envelope(PoisonPill" ⇒ true
}
awaitCond(actor.isShutdown, 100 millis)
awaitCond(actor.isTerminated, 100 millis)
}
}

12
akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala
View file

@ -89,7 +89,7 @@ class RestartStrategySpec extends AkkaSpec {
(1 to 100) foreach { _ ⇒ slave ! Crash }
assert(countDownLatch.await(120, TimeUnit.SECONDS))
assert(!slave.isShutdown)
assert(!slave.isTerminated)
}
"ensure that slave restarts after number of crashes not within time range" in {
@ -146,7 +146,7 @@ class RestartStrategySpec extends AkkaSpec {
assert(thirdRestartLatch.tryAwait(1, TimeUnit.SECONDS))
assert(!slave.isShutdown)
assert(!slave.isTerminated)
}
"ensure that slave is not restarted after max retries" in {
@ -183,7 +183,7 @@ class RestartStrategySpec extends AkkaSpec {
// test restart and post restart ping
assert(restartLatch.tryAwait(10, TimeUnit.SECONDS))
assert(!slave.isShutdown)
assert(!slave.isTerminated)
// now crash again... should not restart
slave ! Crash
@ -197,7 +197,7 @@ class RestartStrategySpec extends AkkaSpec {
slave ! Crash
assert(stopLatch.tryAwait(10, TimeUnit.SECONDS))
sleep(500L)
assert(slave.isShutdown)
assert(slave.isTerminated)
}
"ensure that slave is not restarted within time range" in {
@ -237,7 +237,7 @@ class RestartStrategySpec extends AkkaSpec {
// test restart and post restart ping
assert(restartLatch.tryAwait(10, TimeUnit.SECONDS))
assert(!slave.isShutdown)
assert(!slave.isTerminated)
// now crash again... should not restart
slave ! Crash
@ -253,7 +253,7 @@ class RestartStrategySpec extends AkkaSpec {
assert(maxNoOfRestartsLatch.tryAwait(10, TimeUnit.SECONDS))
sleep(500L)
assert(slave.isShutdown)
assert(slave.isTerminated)
}
}
}

6
akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
View file

@ -358,7 +358,7 @@ abstract class ActorModelSpec extends AkkaSpec {
System.err.println("Buddies left: ")
buddies.toArray foreach {
case cell: ActorCell ⇒
System.err.println(" - " + cell.self.path + " " + cell.isShutdown + " " + cell.mailbox.status + " " + cell.mailbox.numberOfMessages + " " + SystemMessage.size(cell.mailbox.systemDrain()))
System.err.println(" - " + cell.self.path + " " + cell.isTerminated + " " + cell.mailbox.status + " " + cell.mailbox.numberOfMessages + " " + SystemMessage.size(cell.mailbox.systemDrain()))
}
System.err.println("Mailbox: " + mq.numberOfMessages + " " + mq.hasMessages + " ")
@ -448,7 +448,7 @@ class DispatcherModelSpec extends ActorModelSpec {
a.stop
b.stop
while (!a.isShutdown && !b.isShutdown) {} //Busy wait for termination
while (!a.isTerminated && !b.isTerminated) {} //Busy wait for termination
assertRefDefaultZero(a)(registers = 1, unregisters = 1, msgsReceived = 1, msgsProcessed = 1)
assertRefDefaultZero(b)(registers = 1, unregisters = 1, msgsReceived = 1, msgsProcessed = 1)
@ -485,7 +485,7 @@ class BalancingDispatcherModelSpec extends ActorModelSpec {
a.stop
b.stop
while (!a.isShutdown && !b.isShutdown) {} //Busy wait for termination
while (!a.isTerminated && !b.isTerminated) {} //Busy wait for termination
assertRefDefaultZero(a)(registers = 1, unregisters = 1, msgsReceived = 1, msgsProcessed = 1)
assertRefDefaultZero(b)(registers = 1, unregisters = 1, msgsReceived = 1, msgsProcessed = 1)

8
akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
View file

@ -32,7 +32,7 @@ class RoutingSpec extends AkkaSpec {
val props = RoutedProps(routerFactory = () ⇒ new DirectRouter, connectionManager = new LocalConnectionManager(List(actor1)))
val actor = new RoutedActorRef(system, props, impl.guardian, "foo")
actor.isShutdown must be(false)
actor.isTerminated must be(false)
}
"send message to connection" in {
@ -86,7 +86,7 @@ class RoutingSpec extends AkkaSpec {
val props = RoutedProps(routerFactory = () ⇒ new RoundRobinRouter, connectionManager = new LocalConnectionManager(List(actor1)))
val actor = new RoutedActorRef(system, props, impl.guardian, "foo")
actor.isShutdown must be(false)
actor.isTerminated must be(false)
}
//In this test a bunch of actors are created and each actor has its own counter.
@ -195,7 +195,7 @@ class RoutingSpec extends AkkaSpec {
val props = RoutedProps(routerFactory = () ⇒ new RandomRouter, connectionManager = new LocalConnectionManager(List(actor1)))
val actor = new RoutedActorRef(system, props, impl.guardian, "foo")
actor.isShutdown must be(false)
actor.isTerminated must be(false)
}
"deliver a broadcast message" in {
@ -313,7 +313,7 @@ class RoutingSpec extends AkkaSpec {
val props = RoutedProps(routerFactory = () ⇒ new ScatterGatherFirstCompletedRouter, connectionManager = new LocalConnectionManager(List(newActor(0))))
val actor = new RoutedActorRef(system, props, impl.guardian, "foo")
actor.isShutdown must be(false)
actor.isTerminated must be(false)
}
"deliver one-way messages in a round robin fashion" in {

4
akka-actor/src/main/scala/akka/actor/ActorCell.scala
View file

@ -118,7 +118,7 @@ private[akka] class ActorCell(
@inline
final def dispatcher: MessageDispatcher = if (props.dispatcher == Props.defaultDispatcher) system.dispatcher else props.dispatcher
final def isShutdown: Boolean = mailbox.isClosed
final def isTerminated: Boolean = mailbox.isClosed
final def start(): Unit = {
mailbox = dispatcher.createMailbox(this)
@ -153,7 +153,7 @@ private[akka] class ActorCell(
final def children: Iterable[ActorRef] = childrenRefs.values.view.map(_.child)
final def getChild(name: String): Option[ActorRef] =
if (isShutdown) None else childrenRefs.get(name).map(_.child)
if (isTerminated) None else childrenRefs.get(name).map(_.child)
final def tell(message: Any, sender: ActorRef): Unit =
dispatcher.dispatch(this, Envelope(message, if (sender eq null) system.deadLetters else sender))

17
akka-actor/src/main/scala/akka/actor/ActorRef.scala
View file

@ -126,7 +126,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable
/**
* Is the actor shut down?
*/
def isShutdown: Boolean
def isTerminated: Boolean
/**
* Registers this actor to be a death monitor of the provided ActorRef
@ -189,11 +189,10 @@ class LocalActorRef private[akka] (
actorCell.start()
/**
* Is the actor shut down?
* Is the actor terminated?
* If this method returns true, it will never return false again, but if it returns false, you cannot be sure if it's alive still (race condition)
*/
//FIXME TODO RENAME TO isTerminated
def isShutdown: Boolean = actorCell.isShutdown
override def isTerminated: Boolean = actorCell.isTerminated
/**
* Suspends the actor so that it will not process messages until resumed. The
@ -242,7 +241,7 @@ class LocalActorRef private[akka] (
// @deprecated("This method does a spin-lock to block for the actor, which might never be there, do not use this", "2.0")
protected[akka] def underlyingActorInstance: Actor = {
var instance = actorCell.actor
while ((instance eq null) && !actorCell.isShutdown) {
while ((instance eq null) && !actorCell.isTerminated) {
try { Thread.sleep(1) } catch { case i: InterruptedException ⇒ }
instance = actorCell.actor
}
@ -339,7 +338,7 @@ trait MinimalActorRef extends ActorRef with ScalaActorRef {
def stop(): Unit = ()
def isShutdown = false
def isTerminated = false
def !(message: Any)(implicit sender: ActorRef = null): Unit = ()
@ -373,7 +372,7 @@ class DeadLetterActorRef(val eventStream: EventStream, val path: ActorPath) exte
def address: String = path.toString
override def isShutdown(): Boolean = true
override def isTerminated(): Boolean = true
override def !(message: Any)(implicit sender: ActorRef = null): Unit = message match {
case d: DeadLetter ⇒ eventStream.publish(d)
@ -420,9 +419,9 @@ abstract class AskActorRef(val path: ActorPath, provider: ActorRefProvider, deat
override def ?(message: Any)(implicit timeout: Timeout): Future[Any] =
new KeptPromise[Any](Left(new UnsupportedOperationException("Ask/? is not supported for %s".format(getClass.getName))))(dispatcher)
override def isShutdown = result.isCompleted || result.isExpired
override def isTerminated = result.isCompleted || result.isExpired
override def stop(): Unit = if (!isShutdown) result.completeWithException(new ActorKilledException("Stopped"))
override def stop(): Unit = if (!isTerminated) result.completeWithException(new ActorKilledException("Stopped"))
@throws(classOf[java.io.ObjectStreamException])
private def writeReplace(): AnyRef = provider.serialize(this)

2
akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
View file

@ -184,7 +184,7 @@ class LocalActorRefProvider(
override def stop() = stopped switchOn { terminationFuture.complete(causeOfTermination.toLeft(())) }
override def isShutdown = stopped.isOn
override def isTerminated = stopped.isOn
override def !(message: Any)(implicit sender: ActorRef = null): Unit = stopped.ifOff(message match {
case Failed(ex) ⇒ causeOfTermination = Some(ex); sender.stop()

8
akka-actor/src/main/scala/akka/event/EventBus.scala
View file

@ -246,19 +246,19 @@ trait ActorClassification { this: ActorEventBus with ActorClassifier ⇒
val current = mappings get monitored
current match {
case null ⇒
if (monitored.isShutdown) false
if (monitored.isTerminated) false
else {
if (mappings.putIfAbsent(monitored, Vector(monitor)) ne null) associate(monitored, monitor)
else if (monitored.isShutdown) !dissociate(monitored, monitor) else true
else if (monitored.isTerminated) !dissociate(monitored, monitor) else true
}
case raw: Vector[_] ⇒
val v = raw.asInstanceOf[Vector[ActorRef]]
if (monitored.isShutdown) false
if (monitored.isTerminated) false
if (v.contains(monitor)) true
else {
val added = v :+ monitor
if (!mappings.replace(monitored, v, added)) associate(monitored, monitor)
else if (monitored.isShutdown) !dissociate(monitored, monitor) else true
else if (monitored.isTerminated) !dissociate(monitored, monitor) else true
}
}
}

4
akka-actor/src/main/scala/akka/routing/Routing.scala
View file

@ -177,7 +177,7 @@ private[akka] class RoutedActorRef(system: ActorSystem, val routedProps: RoutedP
@volatile
private var running: Boolean = true
override def isShutdown: Boolean = !running
override def isTerminated: Boolean = !running
override def stop() {
synchronized {
@ -411,7 +411,7 @@ trait ScatterGatherRouter extends BasicRouter with Serializable {
private def scatterGather[S, G >: S](message: Any, timeout: Timeout): Future[G] = {
val responses = connectionManager.connections.iterable.flatMap { actor ⇒
try {
if (actor.isShutdown) throw ActorInitializationException(actor, "For compatability - check death first", new Exception) // for stack trace
if (actor.isTerminated) throw ActorInitializationException(actor, "For compatability - check death first", new Exception) // for stack trace
Some(actor.?(message, timeout).asInstanceOf[Future[S]])
} catch {
case e: Exception ⇒

6
akka-actor/src/main/scala/akka/util/ListenerManagement.scala
View file

@ -44,7 +44,7 @@ trait ListenerManagement {
def hasListeners: Boolean = !listeners.isEmpty
/**
* Checks if a specific listener is registered. Pruned eventually when isShutdown==true in notify.
* Checks if a specific listener is registered. Pruned eventually when isTerminated==true in notify.
*/
def hasListener(listener: ActorRef): Boolean = listeners.contains(listener)
@ -54,7 +54,7 @@ trait ListenerManagement {
val iterator = listeners.iterator
while (iterator.hasNext) {
val listener = iterator.next
if (listener.isShutdown) iterator.remove()
if (listener.isTerminated) iterator.remove()
else listener ! msg
}
}
@ -67,7 +67,7 @@ trait ListenerManagement {
val iterator = listeners.iterator
while (iterator.hasNext) {
val listener = iterator.next
if (listener.isShutdown) iterator.remove()
if (listener.isTerminated) iterator.remove()
else f(listener)
}
}

2
akka-camel/src/main/scala/akka/camel/component/ActorComponent.scala
View file

@ -268,7 +268,7 @@ private[akka] class AsyncCallbackAdapter(exchange: Exchange, callback: AsyncCall
@volatile
private var running: Boolean = true
def isShutdown: Boolean = !running
def isTerminated: Boolean = !running
def suspend(): Unit = ()

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

@ -281,7 +281,7 @@ private[akka] case class RemoteActorRef private[akka] (
def address = remoteAddress + path.toString
def isShutdown: Boolean = !running
def isTerminated: Boolean = !running
protected[akka] def sendSystemMessage(message: SystemMessage): Unit = unsupported

4
akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
View file

@ -95,9 +95,9 @@ class AkkaSpecSpec extends WordSpec with MustMatchers {
val spec = new AkkaSpec(system) {
val ref = Seq(testActor, system.actorOf(Props.empty, "name"))
}
spec.ref foreach (_ must not be 'shutdown)
spec.ref foreach (_.isTerminated must not be true)
system.stop()
spec.awaitCond(spec.ref forall (_.isShutdown), 2 seconds)
spec.awaitCond(spec.ref forall (_.isTerminated), 2 seconds)
}
}
}

4
akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
View file

@ -160,7 +160,7 @@ class TestActorRefSpec extends AkkaSpec with BeforeAndAfterEach {
expectMsgPF(5 seconds) {
case Terminated(`a`) ⇒ true
}
a must be('shutdown)
a.isTerminated must be(true)
assertThread
}
}
@ -224,7 +224,7 @@ class TestActorRefSpec extends AkkaSpec with BeforeAndAfterEach {
"proxy apply for the underlying actor" in {
val ref = TestActorRef[WorkerActor]
ref("work")
ref.isShutdown must be(true)
ref.isTerminated must be(true)
}
}