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

Temporary fix for the throughput benchmark

Browse source
This commit is contained in:
Viktor Klang 2011-11-14 19:19:44 +01:00
parent d14e524485
commit 66dd0123bc
4 changed files with 54 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

22
akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
View file

@ -74,7 +74,9 @@ class Dispatcher(
extends MessageDispatcher(_app) {
protected[akka] val executorServiceFactory = executorServiceFactoryProvider.createExecutorServiceFactory(name)
protected[akka] val executorService = new AtomicReference[ExecutorService](new LazyExecutorServiceWrapper(executorServiceFactory.createExecutorService))
protected[akka] val executorService = new AtomicReference[ExecutorService](new ExecutorServiceDelegate {
lazy val executor = executorServiceFactory.createExecutorService
})
protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope) = {
val mbox = receiver.mailbox
@ -103,9 +105,11 @@ class Dispatcher(
protected[akka] def start {}
protected[akka] def shutdown {
val old = executorService.getAndSet(new LazyExecutorServiceWrapper(executorServiceFactory.createExecutorService))
if (old ne null) {
old.shutdown()
executorService.getAndSet(new ExecutorServiceDelegate {
lazy val executor = executorServiceFactory.createExecutorService
}) match {
case null ⇒
case some ⇒ some.shutdown()
}
}
@ -113,19 +117,13 @@ class Dispatcher(
* Returns if it was registered
*/
protected[akka] override def registerForExecution(mbox: Mailbox, hasMessageHint: Boolean, hasSystemMessageHint: Boolean): Boolean = {
if (mbox.shouldBeRegisteredForExecution(hasMessageHint, hasSystemMessageHint)) { //This needs to be here to ensure thread safety and no races
if (mbox.shouldBeScheduledForExecution(hasMessageHint, hasSystemMessageHint)) { //This needs to be here to ensure thread safety and no races
if (mbox.setAsScheduled()) {
try {
executorService.get() execute mbox
true
} catch {
case e: RejectedExecutionException ⇒
try {
app.eventStream.publish(Warning(this, e.toString))
} finally {
mbox.setAsIdle()
}
throw e
case e: RejectedExecutionException ⇒ executorService.get() execute mbox; true //Retry once
}
} else false
} else false