Elides the need to allocate an AkkaForkJoinTask for Mailbox-submission to... #16152
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ import akka.event.{ BusLogging, EventStream } | |
| import com.typesafe.config.{ ConfigFactory, Config } | ||
| import akka.util.{ Unsafe, Index } | ||
| import scala.annotation.tailrec | ||
| import scala.concurrent.forkjoin.{ ForkJoinTask, ForkJoinPool, ForkJoinWorkerThread } | ||
| import scala.concurrent.duration.Duration | ||
| import scala.concurrent.ExecutionContext | ||
| import scala.concurrent.ExecutionContextExecutor | ||
|
|
@@ -377,8 +377,16 @@ object ForkJoinExecutorConfigurator { | |
| threadFactory: ForkJoinPool.ForkJoinWorkerThreadFactory, | ||
| unhandledExceptionHandler: Thread.UncaughtExceptionHandler) | ||
| extends ForkJoinPool(parallelism, threadFactory, unhandledExceptionHandler, true) with LoadMetrics { | ||
| override def execute(r: Runnable): Unit = { | ||
| if (r eq null) throw new NullPointerException("The Runnable must not be null") | ||
| val task = | ||
| if (r.isInstanceOf[ForkJoinTask[_]]) r.asInstanceOf[ForkJoinTask[Any]] | ||
| else new AkkaForkJoinTask(r) | ||
| Thread.currentThread match { | ||
| case worker: ForkJoinWorkerThread if worker.getPool eq this ⇒ task.fork() | ||
| case _ ⇒ super.execute(task) | ||
| } | ||
| } | ||
|
|
||
| def atFullThrottle(): Boolean = this.getActiveThreadCount() >= this.getParallelism() | ||
| } | ||
|
|
@@ -391,6 +399,9 @@ object ForkJoinExecutorConfigurator { | |
| override def getRawResult(): Unit = () | ||
| override def setRawResult(unit: Unit): Unit = () | ||
| final override def exec(): Boolean = try { runnable.run(); true } catch { | ||
| case ie: InterruptedException ⇒ | ||
| Thread.currentThread.interrupt() | ||
| false | ||
|
Contributor
Author
There was a problem hiding this comment. It's an open question whether this should be
Contributor
There was a problem hiding this comment. I agree. This should be There was a problem hiding this comment. Why don't return false always? It will save from redundant signalling of normal completion of the internal task.
Contributor
Author
There was a problem hiding this comment. I think that's a great point, Andriy.
|
||
| case anything: Throwable ⇒ | ||
| val t = Thread.currentThread | ||
| t.getUncaughtExceptionHandler match { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| /** | ||
| * Copyright (C) 2014 Typesafe Inc. <http://www.typesafe.com> | ||
| */ | ||
| package akka.actor | ||
|
|
||
| import akka.testkit.TestProbe | ||
| import com.typesafe.config.ConfigFactory | ||
| import org.openjdk.jmh.annotations._ | ||
|
|
||
| import scala.concurrent.duration._ | ||
|
|
||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| @State(Scope.Benchmark) | ||
| @BenchmarkMode(Array(Mode.Throughput)) | ||
| @Fork(1) | ||
| @Threads(1) | ||
| @Warmup(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS, batchSize = 1) | ||
| @Measurement(iterations = 20) | ||
| class ForkJoinActorBenchmark { | ||
| import ForkJoinActorBenchmark._ | ||
|
|
||
| @Param(Array("1", "5")) | ||
| var tpt = 0 | ||
|
|
||
| @Param(Array("1", "4")) | ||
| var threads = "" | ||
|
|
||
| implicit var system: ActorSystem = _ | ||
|
|
||
| @Setup(Level.Trial) | ||
| def setup() { | ||
| system = ActorSystem("ForkJoinActorBenchmark", ConfigFactory.parseString( | ||
| s"""| akka { | ||
| | log-dead-letters = off | ||
| | actor { | ||
| | default-dispatcher { | ||
| | executor = "fork-join-executor" | ||
| | fork-join-executor { | ||
| | parallelism-min = 1 | ||
| | parallelism-factor = $threads | ||
| | parallelism-max = 64 | ||
| | } | ||
| | throughput = $tpt | ||
| | } | ||
| | } | ||
| | } | ||
| """.stripMargin)) | ||
| } | ||
|
|
||
| @TearDown(Level.Trial) | ||
| def shutdown() { | ||
| system.shutdown() | ||
| system.awaitTermination() | ||
| } | ||
|
|
||
| @Benchmark | ||
| @Measurement(timeUnit = TimeUnit.MILLISECONDS) | ||
| @OperationsPerInvocation(messages) | ||
| def pingPong = { | ||
| val ping = system.actorOf(Props[ForkJoinActorBenchmark.PingPong]) | ||
| val pong = system.actorOf(Props[ForkJoinActorBenchmark.PingPong]) | ||
|
|
||
| ping.tell(message, pong) | ||
|
|
||
| val p = TestProbe() | ||
| p.watch(ping) | ||
| p.expectTerminated(ping, timeout) | ||
| p.watch(pong) | ||
| p.expectTerminated(pong, timeout) | ||
| } | ||
|
|
||
| @Benchmark | ||
| @Measurement(timeUnit = TimeUnit.MILLISECONDS) | ||
| @OperationsPerInvocation(messages) | ||
| def floodPipe = { | ||
|
|
||
| val end = system.actorOf(Props(classOf[ForkJoinActorBenchmark.Pipe], None)) | ||
| val middle = system.actorOf(Props(classOf[ForkJoinActorBenchmark.Pipe], Some(end))) | ||
| val penultimate = system.actorOf(Props(classOf[ForkJoinActorBenchmark.Pipe], Some(middle))) | ||
| val beginning = system.actorOf(Props(classOf[ForkJoinActorBenchmark.Pipe], Some(penultimate))) | ||
|
|
||
| val p = TestProbe() | ||
| p.watch(end) | ||
|
|
||
| def send(left: Int): Unit = | ||
| if (left > 0) { | ||
| beginning ! message | ||
| send(left - 1) | ||
| } | ||
|
|
||
| send(messages / 4) // we have 4 actors in the pipeline | ||
|
|
||
| beginning ! stop | ||
|
|
||
| p.expectTerminated(end, timeout) | ||
| } | ||
| } | ||
|
|
||
| object ForkJoinActorBenchmark { | ||
| final val stop = "stop" | ||
| final val message = "message" | ||
| final val timeout = 15.seconds | ||
| final val messages = 400000 | ||
| class Pipe(next: Option[ActorRef]) extends Actor { | ||
| def receive = { | ||
| case m @ `message` => | ||
| if(next.isDefined) next.get forward m | ||
| case s @ `stop` => | ||
| context stop self | ||
| if(next.isDefined) next.get forward s | ||
| } | ||
| } | ||
| class PingPong extends Actor { | ||
| var left = messages / 2 | ||
| def receive = { | ||
| case `message` => | ||
|
|
||
| if (left <= 1) | ||
| context stop self | ||
|
|
||
| sender() ! message | ||
| left -= 1 | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
More efficient lines for Java FJP:
and for Scala's FJP:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I don't want to go in and rely on package-protected details, but:
Looks slightly cleaner.