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

renamed dispatchers to more suitable names

Browse source
This commit is contained in:
Jonas Boner 2009-06-11 13:52:22 +02:00
parent 795c7b3da0
commit be2aa089e7
8 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

48
akka.iws
View file

@ -2,14 +2,14 @@
<project relativePaths="false" version="4">
<component name="ChangeListManager">
<list default="true" name="Default" comment="&#10;# Brief commit desciption here&#10;&#10;# Full commit description here (comment lines starting with '#' will not be included)&#10;&#10;">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/CassandraNode.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/CassandraNode.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/Actor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/Actor.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/State.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/State.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala" />
<change type="MOVED" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala" />
<change type="MOVED" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ProxyMessageDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ProxyDispatcher.scala" />
</list>
<ignored path="akka.iws" />
<ignored path=".idea/workspace.xml" />
@ -142,7 +142,7 @@
<file leaf-file-name="ActiveObject.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="137" column="0" selection-start="4931" selection-end="4931" vertical-scroll-proportion="0.0">
<state line="137" column="0" selection-start="4924" selection-end="4924" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@ -202,28 +202,28 @@
</provider>
</entry>
</file>
<file leaf-file-name="ProxyMessageDispatcher.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ProxyMessageDispatcher.scala">
<file leaf-file-name="ProxyDispatcher.scala" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ProxyDispatcher.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="12" column="6" selection-start="401" selection-end="401" vertical-scroll-proportion="0.0">
<state line="60" column="6" selection-start="2239" selection-end="2239" vertical-scroll-proportion="0.9080235">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ThreadBasedDispatcher.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala">
<file leaf-file-name="EventBasedThreadPoolDispatcher.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="102" column="0" selection-start="3620" selection-end="3620" vertical-scroll-proportion="0.0">
<state line="12" column="12" selection-start="407" selection-end="407" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="EventBasedDispatcher.scala" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedDispatcher.scala">
<file leaf-file-name="EventBasedSingleThreadDispatcher.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="30" column="13" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@ -1337,7 +1337,7 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32472324" sideWeight="0.5" order="1" side_tool="false" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24873829" sideWeight="0.74165636" order="0" side_tool="false" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21771218" sideWeight="0.5" order="12" side_tool="false" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21771218" sideWeight="0.5" order="12" side_tool="false" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24945927" sideWeight="0.6875" order="1" side_tool="false" />
@ -1439,7 +1439,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="137" column="0" selection-start="4931" selection-end="4931" vertical-scroll-proportion="0.0">
<state line="137" column="0" selection-start="4924" selection-end="4924" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@ -1486,23 +1486,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ProxyMessageDispatcher.scala">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="12" column="6" selection-start="401" selection-end="401" vertical-scroll-proportion="0.0">
<state line="12" column="12" selection-start="407" selection-end="407" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="102" column="0" selection-start="3620" selection-end="3620" vertical-scroll-proportion="0.0">
<state line="30" column="13" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedDispatcher.scala">
<entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ProxyDispatcher.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="60" column="6" selection-start="2239" selection-end="2239" vertical-scroll-proportion="0.9080235">
<folding />
</state>
</provider>

2
kernel/src/main/scala/ActiveObject.scala
View file

@ -96,7 +96,7 @@ sealed class TransactionalAroundAdvice(target: Class[_],
server.transactionalVectors = vectors
import kernel.reactor._
private[this] var dispatcher = new ProxyMessageDispatcher
private[this] var dispatcher = new ProxyDispatcher
private[this] var mailbox = dispatcher.messageQueue
dispatcher.start

4
kernel/src/main/scala/Actor.scala
View file

@ -120,9 +120,9 @@ trait Actor {
if (!isRunning) {
dispatcherType match {
case EventBased =>
dispatcher = new EventBasedDispatcher
dispatcher = new EventBasedSingleThreadDispatcher
case ThreadBased =>
dispatcher = new ThreadBasedDispatcher
dispatcher = new EventBasedThreadPoolDispatcher
}
mailbox = dispatcher.messageQueue
dispatcher.registerHandler(this, new ActorMessageHandler(this))

10
kernel/src/main/scala/reactor/EventBasedDispatcher.scala → kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala
View file

@ -10,10 +10,10 @@
*/
package se.scalablesolutions.akka.kernel.reactor
class EventBasedDispatcher extends MessageDispatcherBase {
class EventBasedSingleThreadDispatcher extends MessageDispatcherBase {
def start = if (!active) {
active = true
val messageDemultiplexer = new EventBasedDemultiplexer(messageQueue)
val messageDemultiplexer = new EventBasedSingleThreadDemultiplexer(messageQueue)
selectorThread = new Thread {
override def run = {
while (active) {
@ -34,7 +34,7 @@ class EventBasedDispatcher extends MessageDispatcherBase {
}
}
class EventBasedDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
class EventBasedSingleThreadDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
import java.util.{LinkedList, Queue}
private val selectedQueue: Queue[MessageHandle] = new LinkedList[MessageHandle]
@ -43,7 +43,7 @@ class EventBasedDemultiplexer(private val messageQueue: MessageQueue) extends Me
def acquireSelectedQueue: Queue[MessageHandle] = selectedQueue
def releaseSelectedQueue = throw new UnsupportedOperationException("EventBasedDemultiplexer can't release its queue")
def releaseSelectedQueue = throw new UnsupportedOperationException("EventBasedSingleThreadDemultiplexer can't release its queue")
def wakeUp = throw new UnsupportedOperationException("EventBasedDemultiplexer can't be woken up")
def wakeUp = throw new UnsupportedOperationException("EventBasedSingleThreadDemultiplexer can't be woken up")
}

6
kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala → kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala
View file

@ -10,7 +10,7 @@
*/
package se.scalablesolutions.akka.kernel.reactor
class ThreadBasedDispatcher extends MessageDispatcherBase {
class EventBasedThreadPoolDispatcher extends MessageDispatcherBase {
import java.util.concurrent.Executors
import java.util.HashSet
@ -22,7 +22,7 @@ class ThreadBasedDispatcher extends MessageDispatcherBase {
def start = if (!active) {
active = true
val messageDemultiplexer = new ThreadBasedDemultiplexer(messageQueue)
val messageDemultiplexer = new EventBasedThreadPoolDemultiplexer(messageQueue)
selectorThread = new Thread {
//val enqued = new LinkedList[MessageHandle]
override def run = {
@ -74,7 +74,7 @@ class ThreadBasedDispatcher extends MessageDispatcherBase {
private def free(key: AnyRef) = synchronized { busyHandlers.remove(key) }
}
class ThreadBasedDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
class EventBasedThreadPoolDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
import java.util.concurrent.locks.ReentrantLock
import java.util.{LinkedList, Queue}

6
kernel/src/main/scala/reactor/ProxyMessageDispatcher.scala → kernel/src/main/scala/reactor/ProxyDispatcher.scala
View file

@ -10,7 +10,7 @@
*/
package se.scalablesolutions.akka.kernel.reactor
class ProxyMessageDispatcher extends MessageDispatcherBase {
class ProxyDispatcher extends MessageDispatcherBase {
import java.util.concurrent.Executors
import java.util.HashSet
import org.codehaus.aspectwerkz.joinpoint.JoinPoint
@ -22,7 +22,7 @@ class ProxyMessageDispatcher extends MessageDispatcherBase {
def start = if (!active) {
active = true
val messageDemultiplexer = new ProxyMessageDemultiplexer(messageQueue)
val messageDemultiplexer = new ProxyDemultiplexer(messageQueue)
selectorThread = new Thread {
override def run = {
while (active) {
@ -58,7 +58,7 @@ class ProxyMessageDispatcher extends MessageDispatcherBase {
override protected def doShutdown = handlerExecutor.shutdownNow
}
class ProxyMessageDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
class ProxyDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
import java.util.concurrent.locks.ReentrantLock
import java.util.{LinkedList, Queue}

6
kernel/src/test/scala/EventBasedDispatcherTest.scala
View file

@ -57,7 +57,7 @@ class EventBasedDispatcherTest {
val guardLock = new ReentrantLock
val handleLatch = new CountDownLatch(10)
val key = "key"
val dispatcher = new EventBasedDispatcher
val dispatcher = new EventBasedSingleThreadDispatcher
dispatcher.registerHandler(key, new TestMessageHandle(handleLatch))
dispatcher.start
for (i <- 0 until 10) {
@ -71,7 +71,7 @@ class EventBasedDispatcherTest {
val handleLatch = new CountDownLatch(2)
val key1 = "key1"
val key2 = "key2"
val dispatcher = new EventBasedDispatcher
val dispatcher = new EventBasedSingleThreadDispatcher
dispatcher.registerHandler(key1, new TestMessageHandle(handleLatch))
dispatcher.registerHandler(key2, new TestMessageHandle(handleLatch))
dispatcher.start
@ -85,7 +85,7 @@ class EventBasedDispatcherTest {
val handleLatch = new CountDownLatch(200)
val key1 = "key1"
val key2 = "key2"
val dispatcher = new EventBasedDispatcher
val dispatcher = new EventBasedSingleThreadDispatcher
dispatcher.registerHandler(key1, new MessageHandler {
var currentValue = -1;
def handle(message: MessageHandle) {

6
kernel/src/test/scala/ThreadBasedDispatcherTest.scala
View file

@ -39,7 +39,7 @@ class ThreadBasedDispatcherTest {
val guardLock = new ReentrantLock
val handleLatch = new CountDownLatch(100)
val key = "key"
val dispatcher = new ThreadBasedDispatcher
val dispatcher = new EventBasedThreadPoolDispatcher
dispatcher.registerHandler(key, new MessageHandler {
def handle(message: MessageHandle) {
try {
@ -68,7 +68,7 @@ class ThreadBasedDispatcherTest {
val handlersBarrier = new CyclicBarrier(3)
val key1 = "key1"
val key2 = "key2"
val dispatcher = new ThreadBasedDispatcher
val dispatcher = new EventBasedThreadPoolDispatcher
dispatcher.registerHandler(key1, new MessageHandler {
def handle(message: MessageHandle) = synchronized {
try {handlersBarrier.await(1, TimeUnit.SECONDS)}
@ -93,7 +93,7 @@ class ThreadBasedDispatcherTest {
val handleLatch = new CountDownLatch(200)
val key1 = "key1"
val key2 = "key2"
val dispatcher = new ThreadBasedDispatcher
val dispatcher = new EventBasedThreadPoolDispatcher
dispatcher.registerHandler(key1, new MessageHandler {
var currentValue = -1;
def handle(message: MessageHandle) {