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

Making sure that dispatcher scheduling for shutdown is checked even if unregister throws up

Browse source
This commit is contained in:
Viktor Klang 2011-11-16 16:19:56 +01:00
parent 39b374ba22
commit 1613ff5111
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java Normal file
View file

@ -0,0 +1,19 @@
/**
* Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
*/
package akka.dispatch;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
abstract class AbstractMessageDispatcher {
private volatile int _shutdownSchedule; // not initialized because this is faster: 0 == UNSCHEDULED
protected final static AtomicIntegerFieldUpdater<AbstractMessageDispatcher> shutdownScheduleUpdater =
AtomicIntegerFieldUpdater.newUpdater(AbstractMessageDispatcher.class, "_shutdownSchedule");
private volatile long _inhabitants; // not initialized because this is faster
protected final static AtomicLongFieldUpdater<AbstractMessageDispatcher> inhabitantsUpdater =
AtomicLongFieldUpdater.newUpdater(AbstractMessageDispatcher.class, "_inhabitants");
}

11
akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
View file

@ -107,15 +107,14 @@ abstract class MessageDispatcher(val app: ActorSystem) extends AbstractMessageDi
/**
* Attaches the specified actor instance to this dispatcher
*/
final def attach(actor: ActorCell) {
register(actor)
}
final def attach(actor: ActorCell): Unit = register(actor)
/**
* Detaches the specified actor instance from this dispatcher
*/
final def detach(actor: ActorCell) {
final def detach(actor: ActorCell): Unit = try {
unregister(actor)
} finally {
ifSensibleToDoSoThenScheduleShutdown()
}
@ -152,7 +151,7 @@ abstract class MessageDispatcher(val app: ActorSystem) extends AbstractMessageDi
() ⇒ if (inhabitantsUpdater.decrementAndGet(this) == 0) ifSensibleToDoSoThenScheduleShutdown()
/**
* Don't call this, this calls you. See "attach" for only invocation
* If you override it, you must call it. But only ever once. See "attach" for only invocation
*/
protected[akka] def register(actor: ActorCell) {
inhabitantsUpdater.incrementAndGet(this)
@ -161,7 +160,7 @@ abstract class MessageDispatcher(val app: ActorSystem) extends AbstractMessageDi
}
/**
* Don't call this, this calls you. See "detach" for the only invocation
* If you override it, you must call it. But only ever once. See "detach" for the only invocation
*/
protected[akka] def unregister(actor: ActorCell) {
inhabitantsUpdater.decrementAndGet(this)