Nabble - ActiveMQ - Commits

svn commit: r887737 - /activemq/activemq-cpp/trunk/activemq-cpp/RELEASE_NOTES.txt

2009-12-06T10:35:39Z

Author: tabish
Date: Sun Dec 6 18:35:39 2009
New Revision: 887737

URL: http://svn.apache.org/viewvc?rev=887737&view=rev
Log:
Update Changelog.

Modified:
activemq/activemq-cpp/trunk/activemq-cpp/RELEASE_NOTES.txt

Modified: activemq/activemq-cpp/trunk/activemq-cpp/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/RELEASE_NOTES.txt?rev=887737&r1=887736&r2=887737&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/RELEASE_NOTES.txt (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/RELEASE_NOTES.txt Sun Dec 6 18:35:39 2009
@@ -24,6 +24,7 @@
decaf::io::ByteArrayOutputStream::write( const unsigned char* buffer,
std::size_t offset, std::size_t len )
* [AMQCPP-270] - Broker exception on message Ack,
+ * [AMQCPP-271] - Connection shutdown crashes if the server went down

Improvement

svn commit: r887736 - /activemq/activemq-cpp/branches/activemq-cpp-3.1.x/

2009-12-06T10:32:07Z

Author: tabish
Date: Sun Dec 6 18:32:07 2009
New Revision: 887736

URL: http://svn.apache.org/viewvc?rev=887736&view=rev
Log:
Drop this branch while trunk is still acting as a 3.1 SNAPSHOT.

Removed:
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/

svn commit: r887735 - /activemq/activemq-cpp/trunk/pom.xml

2009-12-06T10:31:08Z

Author: tabish
Date: Sun Dec 6 18:31:07 2009
New Revision: 887735

URL: http://svn.apache.org/viewvc?rev=887735&view=rev
Log:
revert version update while more 3.1 work is in progress,

Modified:
activemq/activemq-cpp/trunk/pom.xml

Modified: activemq/activemq-cpp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/pom.xml?rev=887735&r1=887734&r2=887735&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/pom.xml (original)
+++ activemq/activemq-cpp/trunk/pom.xml Sun Dec 6 18:31:07 2009
@@ -27,7 +27,7 @@

<groupId>org.apache.activemq-cpp</groupId>
<artifactId>activemq-cpp-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ActiveMQ-CPP Project</name>
<inceptionYear>2007</inceptionYear>

svn commit: r887734 - in /activemq/activemq-cpp/trunk: activemq-c/pom.xml activemq-cpp-openwire-generator/pom.xml activemq-cpp/configure.ac activemq-cpp/pom.xml activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp

2009-12-06T10:30:28Z

Author: tabish
Date: Sun Dec 6 18:30:27 2009
New Revision: 887734

URL: http://svn.apache.org/viewvc?rev=887734&view=rev
Log:
Reverting versioning updates while more 3.1 work is in progress.

Modified:
activemq/activemq-cpp/trunk/activemq-c/pom.xml
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml
activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
activemq/activemq-cpp/trunk/activemq-cpp/pom.xml
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp

Modified: activemq/activemq-cpp/trunk/activemq-c/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-c/pom.xml?rev=887734&r1=887733&r2=887734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-c/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-c/pom.xml Sun Dec 6 18:30:27 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.activemq-cpp</groupId>
<artifactId>activemq-cpp-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>activemq-c-library</artifactId>

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml?rev=887734&r1=887733&r2=887734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml Sun Dec 6 18:30:27 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.activemq-cpp</groupId>
<artifactId>activemq-cpp-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>activemq-cpp-openwire-generator</artifactId>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?rev=887734&r1=887733&r2=887734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Sun Dec 6 18:30:27 2009
@@ -20,7 +20,7 @@
## --------------------------------
## Initialization macros.
## --------------------------------
-AC_INIT(activemq-cpp, 3.2.0, dev@...)
+AC_INIT(activemq-cpp, 3.1.0, dev@...)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@
## -----------------------------------------------
ACTIVEMQ_LIBRARY_NAME=activemq-cpp
ACTIVEMQ_MAJOR_VERSION=3
-ACTIVEMQ_MINOR_VERSION=2
+ACTIVEMQ_MINOR_VERSION=1
ACTIVEMQ_PATCH_VERSION=0
ACTIVEMQ_VERSION=${ACTIVEMQ_MAJOR_VERSION}.${ACTIVEMQ_MINOR_VERSION}.${ACTIVEMQ_PATCH_VERSION}
ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
@@ -48,7 +48,7 @@
## REVISION: a change in the REVISION number is made for any other type of change
## that does not justify a change to MINOR or MAJOR
##
-ACTIVEMQ_LIBRARY_VERSION=12:0:0
+ACTIVEMQ_LIBRARY_VERSION=11:0:0

AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
AC_SUBST(ACTIVEMQ_VERSION)

Modified: activemq/activemq-cpp/trunk/activemq-cpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/pom.xml?rev=887734&r1=887733&r2=887734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/pom.xml Sun Dec 6 18:30:27 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.activemq-cpp</groupId>
<artifactId>activemq-cpp-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>activemq-cpp-library</artifactId>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp?rev=887734&r1=887733&r2=887734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp Sun Dec 6 18:30:27 2009
@@ -51,7 +51,7 @@

////////////////////////////////////////////////////////////////////////////////
std::string ActiveMQConnectionMetaData::getProviderVersion() const throw( cms::CMSException ) {
- return "3.2";
+ return "3.1";
}

////////////////////////////////////////////////////////////////////////////////
@@ -61,7 +61,7 @@

////////////////////////////////////////////////////////////////////////////////
int ActiveMQConnectionMetaData::getProviderMinorVersion() const throw( cms::CMSException ) {
- return 2;
+ return 1;
}

////////////////////////////////////////////////////////////////////////////////

svn commit: r887732 - in /activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main: activemq/core/ActiveMQSession.cpp decaf/lang/Thread.cpp decaf/lang/Thread.h

2009-12-06T10:25:26Z

Author: tabish
Date: Sun Dec 6 18:25:26 2009
New Revision: 887732

URL: http://svn.apache.org/viewvc?rev=887732&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-271

Fix the Threads class to work with Foreign Thread instances. Move the close marker in session to after the close of the session resources.

Modified:
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.h

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=887732&r1=887731&r2=887732&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Sun Dec 6 18:25:26 2009
@@ -118,9 +118,6 @@

try {

- // Now indicate that this session is closed.
- closed = true;
-
// Stop the dispatch executor.
stop();

@@ -158,6 +155,9 @@
}
}

+ // Now indicate that this session is closed.
+ closed = true;
+
// Remove this sessions from the connection
this->connection->removeSession( this );

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.cpp?rev=887732&r1=887731&r2=887732&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.cpp Sun Dec 6 18:25:26 2009
@@ -31,6 +31,8 @@
#include <decaf/util/concurrent/TimeUnit.h>
#include <decaf/util/concurrent/Mutex.h>

+#include <vector>
+
#if HAVE_PTHREAD_H
#include <pthread.h>
#endif
@@ -169,6 +171,7 @@
namespace{

Thread* mainThread = NULL;
+ std::vector<Thread*> foreignThreads;

#ifdef HAVE_PTHREAD_H

@@ -224,51 +227,67 @@
////////////////////////////////////////////////////////////////////////////////
void Thread::initThreading() {

- mainThread = new Thread( "Main Thread" );
+ // We mark the thread where Decaf's Init routine is called from as our Main Thread.
+ mainThread = Thread::createForeignThreadInstance( "Main Thread" );
+}

- mainThread->properties->state = Thread::RUNNABLE;
- mainThread->properties->priority = Thread::NORM_PRIORITY;
- mainThread->properties->parent = mainThread;
+////////////////////////////////////////////////////////////////////////////////
+void Thread::shutdownThreading() {

- #ifdef HAVE_PTHREAD_H
+ // Clear the Main Thread instance pointer, this indicates we are Shutdown.
+ mainThread = NULL;

- mainThread->properties->handle = pthread_self();
+ // Destroy any Foreign Thread Facades that were created during runtime.
+ std::vector<Thread*>::iterator iter = foreignThreads.begin();
+ for( ; iter != foreignThreads.end(); ++iter ) {
+ delete *iter;
+ }
+ foreignThreads.clear();

- // Create the Key used to store the Current Thread data
- pthread_key_create( ¤tThreadKey, NULL );
- pthread_setspecific( currentThreadKey, mainThread );
+ #ifdef HAVE_PTHREAD_H

- #else
+ // Destroy the current Thread key now, no longer needed.
+ pthread_key_delete( currentThreadKey );

- mainThread->properties->handle = ::GetCurrentThread();
+ #else

- // Create the key used to store the Current Thread data
- currentThreadKey = ::TlsAlloc();
- ::TlsSetValue( currentThreadKey, mainThread );
+ // Destroy our TLS resources before we shutdown.
+ ::TlsFree( currentThreadKey );

#endif
}

////////////////////////////////////////////////////////////////////////////////
-void Thread::shutdownThreading() {
+Thread* Thread::createForeignThreadInstance( const std::string& name ) {
+
+ Thread* foreignThread = new Thread( name );
+
+ foreignThread->properties->state = Thread::RUNNABLE;
+ foreignThread->properties->priority = Thread::NORM_PRIORITY;
+ foreignThread->properties->parent = NULL;

#ifdef HAVE_PTHREAD_H

- // Destroy the Main Thread instance.
- delete mainThread;
+ foreignThread->properties->handle = pthread_self();

- // Destroy the current Thread key now, no longer needed.
- pthread_key_delete( currentThreadKey );
+ // Create the Key used to store the Current Thread data
+ pthread_key_create( ¤tThreadKey, NULL );
+ pthread_setspecific( currentThreadKey, foreignThread );

#else

- // Destroy the Main Thread instance.
- delete mainThread;
+ foreignThread->properties->handle = ::GetCurrentThread();

- // Destroy our TLS resources before we shutdown.
- ::TlsFree( currentThreadKey );
+ // Create the key used to store the Current Thread data
+ currentThreadKey = ::TlsAlloc();
+ ::TlsSetValue( currentThreadKey, foreignThread );

#endif
+
+ // Store the Facade for later deletion
+ foreignThreads.push_back( foreignThread );
+
+ return foreignThread;
}

////////////////////////////////////////////////////////////////////////////////
@@ -573,6 +592,11 @@
////////////////////////////////////////////////////////////////////////////////
Thread* Thread::currentThread() {

+ if( mainThread == NULL ) {
+ throw RuntimeException(
+ __FILE__, __LINE__, "The Decaf Threading API is in a Shutdown State." );
+ }
+
void* result = NULL;

#ifdef HAVE_PTHREAD_H
@@ -585,9 +609,11 @@

#endif

+ // This is a foreign Thread (Not Created By Decaf) lets create a stand in Thread
+ // instance so that other threads in Decaf can join it and wait on it.
if( result == NULL ) {
- throw RuntimeException(
- __FILE__, __LINE__, "Failed to find the Current Thread pointer in the TLS." );
+ result = Thread::createForeignThreadInstance(
+ std::string( "ForeignThread-" ) + Integer::toString( Thread::getId() ) );
}

return (Thread*)result;

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.h?rev=887732&r1=887731&r2=887732&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.h (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/lang/Thread.h Sun Dec 6 18:25:26 2009
@@ -359,6 +359,9 @@
// Initialize the Threads internal state
void initialize( Runnable* task, const std::string& name );

+ // Create a Thread Facade for threads not created by the Decaf Library.
+ static Thread* createForeignThreadInstance( const std::string& name );
+
// Called by the Decaf Runtime at startup to allow the Platform Threading
// code to initialize any necessary Threading constructs needed to support
// the features of this class.

svn commit: r887730 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main: activemq/core/ActiveMQSession.cpp decaf/lang/Thread.cpp decaf/lang/Thread.h

2009-12-06T10:20:35Z

Author: tabish
Date: Sun Dec 6 18:20:35 2009
New Revision: 887730

URL: http://svn.apache.org/viewvc?rev=887730&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-271

Fix the Threads class to work with Foreign Thread instances. Move the close marker in session to after the close of the session resources.

Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=887730&r1=887729&r2=887730&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Sun Dec 6 18:20:35 2009
@@ -118,9 +118,6 @@

try {

- // Now indicate that this session is closed.
- closed = true;
-
// Stop the dispatch executor.
stop();

@@ -158,6 +155,9 @@
}
}

+ // Now indicate that this session is closed.
+ closed = true;
+
// Remove this sessions from the connection
this->connection->removeSession( this );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp?rev=887730&r1=887729&r2=887730&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp Sun Dec 6 18:20:35 2009
@@ -31,6 +31,8 @@
#include <decaf/util/concurrent/TimeUnit.h>
#include <decaf/util/concurrent/Mutex.h>

+#include <vector>
+
#if HAVE_PTHREAD_H
#include <pthread.h>
#endif
@@ -169,6 +171,7 @@
namespace{

Thread* mainThread = NULL;
+ std::vector<Thread*> foreignThreads;

#ifdef HAVE_PTHREAD_H

@@ -224,51 +227,67 @@
////////////////////////////////////////////////////////////////////////////////
void Thread::initThreading() {

- mainThread = new Thread( "Main Thread" );
+ // We mark the thread where Decaf's Init routine is called from as our Main Thread.
+ mainThread = Thread::createForeignThreadInstance( "Main Thread" );
+}

- mainThread->properties->state = Thread::RUNNABLE;
- mainThread->properties->priority = Thread::NORM_PRIORITY;
- mainThread->properties->parent = mainThread;
+////////////////////////////////////////////////////////////////////////////////
+void Thread::shutdownThreading() {

- #ifdef HAVE_PTHREAD_H
+ // Clear the Main Thread instance pointer, this indicates we are Shutdown.
+ mainThread = NULL;

- mainThread->properties->handle = pthread_self();
+ // Destroy any Foreign Thread Facades that were created during runtime.
+ std::vector<Thread*>::iterator iter = foreignThreads.begin();
+ for( ; iter != foreignThreads.end(); ++iter ) {
+ delete *iter;
+ }
+ foreignThreads.clear();

- // Create the Key used to store the Current Thread data
- pthread_key_create( ¤tThreadKey, NULL );
- pthread_setspecific( currentThreadKey, mainThread );
+ #ifdef HAVE_PTHREAD_H

- #else
+ // Destroy the current Thread key now, no longer needed.
+ pthread_key_delete( currentThreadKey );

- mainThread->properties->handle = ::GetCurrentThread();
+ #else

- // Create the key used to store the Current Thread data
- currentThreadKey = ::TlsAlloc();
- ::TlsSetValue( currentThreadKey, mainThread );
+ // Destroy our TLS resources before we shutdown.
+ ::TlsFree( currentThreadKey );

#endif
}

////////////////////////////////////////////////////////////////////////////////
-void Thread::shutdownThreading() {
+Thread* Thread::createForeignThreadInstance( const std::string& name ) {
+
+ Thread* foreignThread = new Thread( name );
+
+ foreignThread->properties->state = Thread::RUNNABLE;
+ foreignThread->properties->priority = Thread::NORM_PRIORITY;
+ foreignThread->properties->parent = NULL;

#ifdef HAVE_PTHREAD_H

- // Destroy the Main Thread instance.
- delete mainThread;
+ foreignThread->properties->handle = pthread_self();

- // Destroy the current Thread key now, no longer needed.
- pthread_key_delete( currentThreadKey );
+ // Create the Key used to store the Current Thread data
+ pthread_key_create( ¤tThreadKey, NULL );
+ pthread_setspecific( currentThreadKey, foreignThread );

#else

- // Destroy the Main Thread instance.
- delete mainThread;
+ foreignThread->properties->handle = ::GetCurrentThread();

- // Destroy our TLS resources before we shutdown.
- ::TlsFree( currentThreadKey );
+ // Create the key used to store the Current Thread data
+ currentThreadKey = ::TlsAlloc();
+ ::TlsSetValue( currentThreadKey, foreignThread );

#endif
+
+ // Store the Facade for later deletion
+ foreignThreads.push_back( foreignThread );
+
+ return foreignThread;
}

////////////////////////////////////////////////////////////////////////////////
@@ -573,6 +592,11 @@
////////////////////////////////////////////////////////////////////////////////
Thread* Thread::currentThread() {

+ if( mainThread == NULL ) {
+ throw RuntimeException(
+ __FILE__, __LINE__, "The Decaf Threading API is in a Shutdown State." );
+ }
+
void* result = NULL;

#ifdef HAVE_PTHREAD_H
@@ -585,9 +609,11 @@

#endif

+ // This is a foreign Thread (Not Created By Decaf) lets create a stand in Thread
+ // instance so that other threads in Decaf can join it and wait on it.
if( result == NULL ) {
- throw RuntimeException(
- __FILE__, __LINE__, "Failed to find the Current Thread pointer in the TLS." );
+ result = Thread::createForeignThreadInstance(
+ std::string( "ForeignThread-" ) + Integer::toString( Thread::getId() ) );
}

return (Thread*)result;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h?rev=887730&r1=887729&r2=887730&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h Sun Dec 6 18:20:35 2009
@@ -359,6 +359,9 @@
// Initialize the Threads internal state
void initialize( Runnable* task, const std::string& name );

+ // Create a Thread Facade for threads not created by the Decaf Library.
+ static Thread* createForeignThreadInstance( const std::string& name );
+
// Called by the Decaf Runtime at startup to allow the Platform Threading
// code to initialize any necessary Threading constructs needed to support
// the features of this class.

svn commit: r887719 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-broker/src/test/java/org/apache/activemq/broker/ activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/...

2009-12-06T09:27:50Z

Author: chirino
Date: Sun Dec 6 17:27:48 2009
New Revision: 887719

URL: http://svn.apache.org/viewvc?rev=887719&view=rev
Log:
better Dispatcher config/factory setup.

Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java Sun Dec 6 17:27:48 2009
@@ -26,7 +26,7 @@
import org.apache.activemq.Service;
import org.apache.activemq.apollo.Connection;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportAcceptListener;
@@ -129,7 +129,7 @@
// apply some default configuration to this broker instance before it's started.
if( dispatcher == null ) {
int threads = Runtime.getRuntime().availableProcessors();
- dispatcher = DispatcherFactory.create(getName(), threads);
+ dispatcher = DispatcherConfig.create(getName(), threads);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java Sun Dec 6 17:27:48 2009
@@ -31,7 +31,7 @@
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.metric.MetricAggregator;
import org.apache.activemq.metric.Period;
import org.apache.activemq.transport.TransportFactory;
@@ -135,7 +135,7 @@
protected abstract String getRemoteWireFormat();

protected Dispatcher createDispatcher() {
- return DispatcherFactory.create("test", asyncThreadPoolSize);
+ return DispatcherConfig.create("test", asyncThreadPoolSize);
}

@Test

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java Sun Dec 6 17:27:48 2009
@@ -27,7 +27,7 @@
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.queue.IQueue;

/**
@@ -47,7 +47,7 @@
protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();

protected Dispatcher createDispatcher() {
- return DispatcherFactory.create("test", Runtime.getRuntime().availableProcessors());
+ return DispatcherConfig.create("test", Runtime.getRuntime().availableProcessors());
}

protected int consumerStartDelay = 0;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java Sun Dec 6 17:27:48 2009
@@ -18,8 +18,6 @@

import java.nio.channels.SelectableChannel;

-import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;
-
/**
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
@@ -29,7 +27,7 @@
final private static Dispatcher dispatcher = create();

private static Dispatcher create() {
- return new SimpleDispatcher("system", Runtime.getRuntime().availableProcessors());
+ return new DispatcherConfig().createDispatcher();
}

static DispatchQueue getMainQueue() {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java Sun Dec 6 17:27:48 2009
@@ -21,7 +21,7 @@

public interface Dispatcher extends Retained {
-
+
public DispatchQueue getGlobalQueue();
public DispatchQueue getGlobalQueue(DispatchPriority priority);

@@ -33,5 +33,6 @@
public DispatchQueue getCurrentQueue();

public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue);
+

}
\ No newline at end of file

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java?rev=887719&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java Sun Dec 6 17:27:48 2009
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch;
+
+import org.apache.activemq.dispatch.internal.advanced.DispatchObserver;
+import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class DispatcherConfig {
+
+ private String label="default";
+ private int threads=Runtime.getRuntime().availableProcessors();
+ private DispatchObserver observer;
+
+ public static Dispatcher create(String name, int threads) {
+ DispatcherConfig config = new DispatcherConfig();
+ config.label=name;
+ config.threads=threads;
+ return config.createDispatcher();
+ }
+
+ public Dispatcher createDispatcher() {
+ return new SimpleDispatcher(this);
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String name) {
+ this.label = name;
+ }
+
+ public int getThreads() {
+ return threads;
+ }
+
+ public void setThreads(int threads) {
+ this.threads = threads;
+ }
+
+ public DispatchObserver getObserver() {
+ return observer;
+ }
+
+ public void setObserver(DispatchObserver observer) {
+ this.observer = observer;
+ }
+
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java Sun Dec 6 17:27:48 2009
@@ -28,6 +28,7 @@
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchSource;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;

@@ -50,15 +51,13 @@

protected LoadBalancer loadBalancer;

- public AdvancedDispatcher(int size, int numPriorities) {
- this.size = size;
- this.numPriorities = numPriorities;
-
+ public AdvancedDispatcher(DispatcherConfig config) {
+ this.size = config.getThreads();
+ this.numPriorities = 3;
globalQueues = new GlobalDispatchQueue[3];
for (int i = 0; i < 3; i++) {
globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i]);
}
-
loadBalancer = new SimpleLoadBalancer();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java Sun Dec 6 17:27:48 2009
@@ -26,6 +26,7 @@
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.DispatchSource;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;

@@ -52,13 +53,13 @@
private final String label;
TimerThread timerThread;

- public SimpleDispatcher(String label, int size) {
- this.label = label;
+ public SimpleDispatcher(DispatcherConfig config) {
+ this.label = config.getLabel();
globalQueues = new GlobalDispatchQueue[3];
for (int i = 0; i < 3; i++) {
globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i] );
}
- dispatchers = new DispatcherThread[size];
+ dispatchers = new DispatcherThread[config.getThreads()];
}

public DispatchQueue getMainQueue() {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Sun Dec 6 17:27:48 2009
@@ -14,6 +14,7 @@

import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatcher;

@@ -45,7 +46,7 @@

public void testActorInvocation() throws Exception
{
- Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatcher advancedSystem = new AdvancedDispatcher(new DispatcherConfig());
advancedSystem.retain();

DispatchQueue queue = advancedSystem.createSerialQueue("test");

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java Sun Dec 6 17:27:48 2009
@@ -33,7 +33,7 @@
public class DispatchSystemTest {

public static void main(String[] args) throws Exception {
- Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatcher advancedSystem = new AdvancedDispatcher(new DispatcherConfig());
advancedSystem.retain();
benchmark("advanced global queue", advancedSystem, advancedSystem.getGlobalQueue(DEFAULT));
benchmark("advanced private serial queue", advancedSystem, advancedSystem.createSerialQueue("test"));
@@ -43,7 +43,7 @@
advancedSystem.release();
latch.await();

- Dispatcher simpleSystem = new SimpleDispatcher("test", Runtime.getRuntime().availableProcessors());
+ Dispatcher simpleSystem = new SimpleDispatcher(new DispatcherConfig());
simpleSystem.retain();

benchmark("simple global queue", simpleSystem, simpleSystem.getGlobalQueue(DEFAULT));

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java Sun Dec 6 17:27:48 2009
@@ -19,6 +19,7 @@
import java.util.concurrent.CountDownLatch;

import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatcherConfig;

import static java.lang.String.*;
@@ -30,7 +31,7 @@
public class DispatcherPoolTest {

public static void main(String[] args) throws Exception {
- AdvancedDispatcher dispatcher = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ AdvancedDispatcher dispatcher = new AdvancedDispatcher(new DispatcherConfig());
dispatcher.retain();

// warm the JIT up..

Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java Sun Dec 6 17:27:48 2009
@@ -23,7 +23,7 @@

import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;

@XmlRootElement(name="dispatcher")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -40,7 +40,7 @@
if( name == null ) {
name = "broker";
}
- return DispatcherFactory.create(name, threads);
+ return DispatcherConfig.create(name, threads);
}

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java Sun Dec 6 17:27:48 2009
@@ -41,7 +41,7 @@
import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.flow.AbstractLimitedFlowResource;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
@@ -83,7 +83,7 @@
protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();

protected Dispatcher createDispatcher() {
- return DispatcherFactory.create("pref-test", THREAD_POOL_SIZE);
+ return DispatcherConfig.create("pref-test", THREAD_POOL_SIZE);
}

protected int consumerStartDelay = 0;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java Sun Dec 6 17:27:48 2009
@@ -22,7 +22,7 @@
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.flow.IFlowSink;
import org.apache.activemq.flow.Commands.Destination;
@@ -189,7 +189,7 @@

protected void createDispatcher() {
if (dispatcher == null) {
- dispatcher = DispatcherFactory.create("mock-broker", Runtime.getRuntime().availableProcessors());
+ dispatcher = DispatcherConfig.create("mock-broker", Runtime.getRuntime().availableProcessors());
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java Sun Dec 6 17:27:48 2009
@@ -21,7 +21,7 @@
import junit.framework.TestCase;

import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -95,7 +95,7 @@
}

protected Dispatcher createDispatcher(String name) {
- return DispatcherFactory.create("test", threadsPerDispatcher);
+ return DispatcherConfig.create("test", threadsPerDispatcher);
}

public void test_1_1_0() throws Exception {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java Sun Dec 6 17:27:48 2009
@@ -8,7 +8,7 @@
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -280,7 +280,7 @@

protected Dispatcher createDispatcher() {
if (dispatcher == null) {
- dispatcher = DispatcherFactory.create("client", threadsPerDispatcher);
+ dispatcher = DispatcherConfig.create("client", threadsPerDispatcher);
}
return dispatcher;
}

svn commit: r887707 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-broker/src/test/java/org/apache/activemq/broker/ activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/...

2009-12-06T08:28:36Z

Author: chirino
Date: Sun Dec 6 16:28:35 2009
New Revision: 887707

URL: http://svn.apache.org/viewvc?rev=887707&view=rev
Log:
Dispatcher is now using the Retained interface to manage it's lifecycle.

Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java Sun Dec 6 16:28:35 2009
@@ -138,7 +138,7 @@
throw new IllegalStateException("Can only start a broker that is in the "+State.CONFIGURATION +" state. Broker was "+state.get());
}
try {
- dispatcher.start();
+ dispatcher.retain();

synchronized(virtualHosts) {
for (VirtualHost virtualHost : virtualHosts.values()) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java Sun Dec 6 16:28:35 2009
@@ -97,7 +97,7 @@
@Before
public void setUp() throws Exception {
dispatcher = createDispatcher();
- dispatcher.start();
+ dispatcher.retain();

if (tcp) {
sendBrokerBindURI = "tcp://localhost:10000?wireFormat=" + getBrokerWireFormat();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java Sun Dec 6 16:28:35 2009
@@ -64,7 +64,7 @@

protected void startServices() throws Exception {
dispatcher = createDispatcher();
- dispatcher.start();
+ dispatcher.retain();
database = new BrokerDatabase(createStore());
database.setDispatcher(dispatcher);
database.start();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java Sun Dec 6 16:28:35 2009
@@ -22,9 +22,6 @@

public interface Dispatcher extends Retained {

- public void start();
- public void shutdown(Runnable onShutdown);
-
public DispatchQueue getGlobalQueue();
public DispatchQueue getGlobalQueue(DispatchPriority priority);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java Sun Dec 6 16:28:35 2009
@@ -24,6 +24,6 @@

public void retain();
public void release();
- public void setShutdownHandler(Runnable shutdownHandler);
+ public void addShutdownWatcher(Runnable shutdownWatcher);

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java Sun Dec 6 16:28:35 2009
@@ -1,28 +1,49 @@
package org.apache.activemq.dispatch.internal;

+import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;

public class BaseRetained {

- final protected AtomicInteger reatinCounter = new AtomicInteger(1);
- final protected AtomicReference<Runnable> shutdownHandler = new AtomicReference<Runnable>();
+ final protected AtomicInteger reatinCounter = new AtomicInteger(0);
+ final protected ArrayList<Runnable> shutdownHandlers = new ArrayList<Runnable>();

- public void setShutdownHandler(Runnable finalizer) {
- this.shutdownHandler.set(finalizer);
+ public void addShutdownWatcher(Runnable shutdownHandler) {
+ synchronized(shutdownHandlers) {
+ shutdownHandlers.add(shutdownHandler);
+ }
}

public void retain() {
- int prev = reatinCounter.getAndIncrement();
- assert prev!=0;
+ if( reatinCounter.getAndIncrement() == 0 ) {
+ startup();
+ }
}

public void release() {
if( reatinCounter.decrementAndGet()==0 ) {
- Runnable value = shutdownHandler.getAndSet(null);
- if( value!=null ) {
- value.run();
- }
+ shutdown();
+ }
+ }
+
+ /**
+ * Subclasses should override if they want to do some startup processing.
+ */
+ protected void startup() {
+ }
+
+
+ /**
+ * Subclasses should override if they want to do clean up.
+ */
+ protected void shutdown() {
+ ArrayList<Runnable> copy;
+ synchronized(shutdownHandlers) {
+ copy = new ArrayList<Runnable>(shutdownHandlers);
+ shutdownHandlers.clear();
+ }
+ for (Runnable runnable : copy) {
+ runnable.run();
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java Sun Dec 6 16:28:35 2009
@@ -22,12 +22,6 @@
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
-
-import static org.apache.activemq.dispatch.DispatcherFactory.*;
-
-import static org.apache.activemq.dispatch.DispatcherFactory.*;

/**
*
@@ -44,6 +38,7 @@

public SerialDispatchQueue(String label) {
this.label = label;
+ retain();
}

public String getLabel() {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java Sun Dec 6 16:28:35 2009
@@ -34,7 +34,7 @@
import static org.apache.activemq.dispatch.DispatchPriority.*;

-public class AdvancedDispatcher extends BaseRetained implements Dispatcher {
+final public class AdvancedDispatcher extends BaseRetained implements Dispatcher {

public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();

@@ -44,10 +44,6 @@

private final ArrayList<DispatcherThread> dispatchers = new ArrayList<DispatcherThread>();

- final AtomicInteger startCounter = new AtomicInteger();
-// final AtomicBoolean started = new AtomicBoolean();
-// final AtomicBoolean shutdown = new AtomicBoolean();
-
private int roundRobinCounter = 0;
private int size;
private final int numPriorities;
@@ -67,54 +63,32 @@
}

/**
- * Subclasses should implement this to return a new dispatcher.
- *
- * @param name
- * The name to assign the dispatcher.
- * @param pool
- * The pool.
- * @return The new dispathcer.
- */
- protected DispatcherThread createDispatcher(String name) throws Exception {
- return new DispatcherThread(this, name, numPriorities);
- }
-
- /**
* @see org.apache.activemq.dispatch.internal.advanced.DispatcherThread#start()
*/
- public synchronized final void start() {
- if( startCounter.getAndIncrement()==0 ) {
- // Create all the workers.
- try {
- loadBalancer.start();
- for (int i = 0; i < size; i++) {
- DispatcherThread dispatacher = createDispatcher("dispatcher -" + (i + 1));
- dispatchers.add(dispatacher);
- dispatacher.start();
- }
- } catch (Exception e) {
- shutdown();
- }
+ protected void startup() {
+ loadBalancer.start();
+ for (int i = 0; i < size; i++) {
+ DispatcherThread dispatacher = new DispatcherThread(this, ("dispatcher -" + (i + 1)), numPriorities);
+ dispatchers.add(dispatacher);
+ dispatacher.start();
}
}
-
- public final void shutdown() {
- shutdown(null);
- }

- /*
- * (non-Javadoc)
- *
- * @see org.apache.activemq.dispatch.IDispatcher#shutdown()
- */
- public final void shutdown(Runnable onShutdown) {
- if( startCounter.decrementAndGet()==0 ) {
- final AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.size());
- for (DispatcherThread d : new ArrayList<DispatcherThread>(dispatchers)) {
- d.shutdown(shutdownCountDown, onShutdown);
+ protected void shutdown() {
+ Runnable countDown = new Runnable() {
+ AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.size());
+ public void run() {
+ if( shutdownCountDown.decrementAndGet()==0 ) {
+ // Notify any registered shutdown watchers.
+ AdvancedDispatcher.super.shutdown();
+ }
}
- loadBalancer.stop();
+ };
+
+ for (DispatcherThread d : new ArrayList<DispatcherThread>(dispatchers)) {
+ d.shutdown(countDown);
}
+ loadBalancer.stop();
}

/**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java Sun Dec 6 16:28:35 2009
@@ -22,7 +22,6 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;

import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.util.Mapper;
@@ -30,8 +29,6 @@
import org.apache.activemq.util.TimerHeap;
import org.apache.activemq.util.list.LinkedNodeList;

-import static org.apache.activemq.dispatch.DispatcherFactory.*;
-
public class DispatcherThread implements Runnable {

static public final ThreadLocal<DispatcherThread> CURRENT = new ThreadLocal<DispatcherThread>();
@@ -124,27 +121,14 @@
thread.start();
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.activemq.dispatch.IDispatcher#shutdown()
- */
- public void shutdown() throws InterruptedException {
- Thread joinThread = shutdown(new AtomicInteger(1), null);
- if (joinThread != null) {
- // thread.interrupt();
- joinThread.join();
- }
- }

- public Thread shutdown(final AtomicInteger shutdownCountDown, final Runnable onShutdown) {
+ public Thread shutdown(final Runnable onShutdown) {
synchronized (this) {
if (thread != null) {
dispatchInternal(new Runnable() {
public void run() {
running = false;
- if( shutdownCountDown.decrementAndGet()==0 && onShutdown!=null) {
+ if( onShutdown!=null ) {
onShutdown.run();
}
}
@@ -153,7 +137,7 @@
thread = null;
return rc;
} else {
- if( shutdownCountDown.decrementAndGet()==0 && onShutdown!=null) {
+ if( onShutdown!=null) {
onShutdown.run();
}
}
@@ -268,7 +252,7 @@
foreignPermits.release();
}

- protected final void onForeignUpdate(DispatchContext context) {
+ protected void onForeignUpdate(DispatchContext context) {
synchronized (foreignQueue) {

ForeignEvent fe = context.updateEvent[foreignToggle];
@@ -281,7 +265,7 @@
}
}

- protected final boolean removeDispatchContext(DispatchContext context) {
+ protected boolean removeDispatchContext(DispatchContext context) {
synchronized (foreignQueue) {

if (context.updateEvent[0].isLinked()) {
@@ -304,7 +288,7 @@
return false;
}

- protected final boolean takeOwnership(DispatchContext context) {
+ protected boolean takeOwnership(DispatchContext context) {
synchronized (this) {
if (running) {
contexts.add(context);
@@ -316,13 +300,13 @@
}

//Special dispatch method that allow high priority dispatch:
- private final void dispatchInternal(Runnable runnable, int priority) {
+ private void dispatchInternal(Runnable runnable, int priority) {
DispatchContext context = new DispatchContext(this, runnable, false, name);
context.priority = priority;
context.requestDispatch();
}

- public final void dispatch(Runnable runnable, int priority) {
+ public void dispatch(Runnable runnable, int priority) {
DispatchContext context = new DispatchContext(this, runnable, false, name);
context.updatePriority(priority);
context.requestDispatch();
@@ -343,11 +327,11 @@
};
}

- public void execute(final Runnable runnable) {
+ public void execute(Runnable runnable) {
dispatch(runnable, 0);
}

- public void execute(final Runnable runnable, int prio) {
+ public void execute(Runnable runnable, int prio) {
dispatch(runnable, prio);
}

@@ -368,7 +352,7 @@
}
}

- final void add(ForeignEvent event) {
+ void add(ForeignEvent event) {
synchronized (foreignQueue) {
if (!event.isLinked()) {
foreignQueue[foreignToggle].addLast(event);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java Sun Dec 6 16:28:35 2009
@@ -78,7 +78,7 @@
throw new UnsupportedOperationException();
}

- public void setShutdownHandler(Runnable finalizer) {
+ public void addShutdownWatcher(Runnable finalizer) {
throw new UnsupportedOperationException();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java Sun Dec 6 16:28:35 2009
@@ -78,7 +78,7 @@
throw new UnsupportedOperationException();
}

- public void setShutdownHandler(Runnable finalizer) {
+ public void addShutdownWatcher(Runnable finalizer) {
throw new UnsupportedOperationException();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java Sun Dec 6 16:28:35 2009
@@ -85,7 +85,7 @@
throw new UnsupportedOperationException();
}

- public void setShutdownHandler(Runnable finalizer) {
+ public void addShutdownWatcher(Runnable finalizer) {
throw new UnsupportedOperationException();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java Sun Dec 6 16:28:35 2009
@@ -38,7 +38,7 @@
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-public class SimpleDispatcher extends BaseRetained implements Dispatcher {
+final public class SimpleDispatcher extends BaseRetained implements Dispatcher {

public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();

@@ -49,7 +49,6 @@

final ConcurrentLinkedQueue<DispatcherThread> waitingDispatchers = new ConcurrentLinkedQueue<DispatcherThread>();
final AtomicInteger waitingDispatcherCount = new AtomicInteger();
- final AtomicInteger startCounter = new AtomicInteger();
private final String label;
TimerThread timerThread;

@@ -109,35 +108,32 @@
}
}

- public void start() {
- if( startCounter.getAndIncrement()==0 ) {
- for (int i = 0; i < dispatchers.length; i++) {
- dispatchers[i] = new DispatcherThread(this, i);
- dispatchers[i].start();
- }
- timerThread = new TimerThread(this);
- timerThread.start();
+ protected void startup() {
+ for (int i = 0; i < dispatchers.length; i++) {
+ dispatchers[i] = new DispatcherThread(this, i);
+ dispatchers[i].start();
}
+ timerThread = new TimerThread(this);
+ timerThread.start();
}

- public void shutdown(final Runnable onShutdown) {
- if( startCounter.decrementAndGet()==0 ) {
-
- final AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.length+1);
- Runnable wrapper = new Runnable() {
- public void run() {
- if( shutdownCountDown.decrementAndGet()==0 && onShutdown!=null) {
- onShutdown.run();
- }
- throw new DispatcherThread.Shutdown();
+ public void shutdown() {
+
+ Runnable countDown = new Runnable() {
+ AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.length+1);
+ public void run() {
+ if( shutdownCountDown.decrementAndGet()==0 ) {
+ // Notify any registered shutdown watchers.
+ SimpleDispatcher.super.shutdown();
}
- };
-
- timerThread.shutdown(wrapper);
- for (int i = 0; i < dispatchers.length; i++) {
- ThreadDispatchQueue queue = dispatchers[i].threadQueues[LOW.ordinal()];
- queue.runnables.add(wrapper);
+ throw new DispatcherThread.Shutdown();
}
+ };
+
+ timerThread.shutdown(countDown);
+ for (int i = 0; i < dispatchers.length; i++) {
+ ThreadDispatchQueue queue = dispatchers[i].threadQueues[LOW.ordinal()];
+ queue.runnables.add(countDown);
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java Sun Dec 6 16:28:35 2009
@@ -112,7 +112,7 @@
throw new UnsupportedOperationException();
}

- public void setShutdownHandler(Runnable finalizer) {
+ public void addShutdownWatcher(Runnable finalizer) {
throw new UnsupportedOperationException();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Sun Dec 6 16:28:35 2009
@@ -46,7 +46,7 @@
public void testActorInvocation() throws Exception
{
Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
- advancedSystem.start();
+ advancedSystem.retain();

DispatchQueue queue = advancedSystem.createSerialQueue("test");
ActorTestObject testObject = Actor.create(new ActorTestObject(), queue);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java Sun Dec 6 16:28:35 2009
@@ -34,22 +34,24 @@

public static void main(String[] args) throws Exception {
Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
- advancedSystem.start();
+ advancedSystem.retain();
benchmark("advanced global queue", advancedSystem, advancedSystem.getGlobalQueue(DEFAULT));
benchmark("advanced private serial queue", advancedSystem, advancedSystem.createSerialQueue("test"));

RunnableCountDownLatch latch = new RunnableCountDownLatch(1);
- advancedSystem.shutdown(latch);
+ advancedSystem.addShutdownWatcher(latch);
+ advancedSystem.release();
latch.await();

Dispatcher simpleSystem = new SimpleDispatcher("test", Runtime.getRuntime().availableProcessors());
- simpleSystem.start();
+ simpleSystem.retain();

benchmark("simple global queue", simpleSystem, simpleSystem.getGlobalQueue(DEFAULT));
benchmark("simple private serial queue", simpleSystem, simpleSystem.createSerialQueue("test"));

latch = new RunnableCountDownLatch(1);
- simpleSystem.shutdown(latch);
+ advancedSystem.addShutdownWatcher(latch);
+ advancedSystem.release();
latch.await();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java Sun Dec 6 16:28:35 2009
@@ -30,21 +30,21 @@
public class DispatcherPoolTest {

public static void main(String[] args) throws Exception {
- AdvancedDispatcher pooledDispatcher = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
- pooledDispatcher.start();
+ AdvancedDispatcher dispatcher = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ dispatcher.retain();

// warm the JIT up..
- benchmarkWork(pooledDispatcher, 100000);
+ benchmarkWork(dispatcher, 100000);

int iterations = 1000*1000*20;
long start = System.nanoTime();
- benchmarkWork(pooledDispatcher, iterations);
+ benchmarkWork(dispatcher, iterations);
long end = System.nanoTime();

double durationMS = 1.0d*(end-start)/1000000d;
double rate = 1000d * iterations / durationMS;

- pooledDispatcher.shutdown();
+ dispatcher.release();
System.out.println(format("duration: %,.3f ms, rate: %,.2f executions/sec", durationMS, rate));
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java Sun Dec 6 16:28:35 2009
@@ -90,7 +90,7 @@

protected void startServices() throws Exception {
dispatcher = createDispatcher();
- dispatcher.start();
+ dispatcher.retain();
database = new BrokerDatabase(createStore());
database.setDispatcher(dispatcher);
if( TEST_MAX_STORE_LATENCY ) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java Sun Dec 6 16:28:35 2009
@@ -88,7 +88,7 @@
}

stop();
- dispatchQueue.setShutdownHandler(onShutdown);
+ dispatchQueue.addShutdownWatcher(onShutdown);
dispatchQueue.release();
dispatchQueue = null;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java Sun Dec 6 16:28:35 2009
@@ -210,7 +210,7 @@
broker.setName("Broker");
broker.createDispatcher();
try {
- broker.getDispatcher().start();
+ broker.getDispatcher().retain();
broker.startServices();
} catch (Exception e) {
// TODO Auto-generated catch block

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java Sun Dec 6 16:28:35 2009
@@ -255,7 +255,7 @@
private void createConnections(int destCount) throws Exception {

dispatcher = createDispatcher("BrokerDispatcher");
- dispatcher.start();
+ dispatcher.retain();

if (multibroker) {
sendBroker = createBroker("SendBroker", sendBrokerURI);
@@ -287,7 +287,7 @@
Dispatcher clientDispatcher = null;
if (SEPARATE_CLIENT_DISPATCHER) {
clientDispatcher = createDispatcher("ClientDispatcher");
- clientDispatcher.start();
+ clientDispatcher.retain();
} else {
clientDispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java Sun Dec 6 16:28:35 2009
@@ -219,7 +219,7 @@
}

public void runTest() throws Exception {
- getDispatcher().start();
+ getDispatcher().retain();

// Start 'em up.
startServices();
@@ -304,7 +304,7 @@
System.out.println(IntrospectionSupport.toString(test));
try
{
- test.getDispatcher().start();
+ test.getDispatcher().retain();
test.createConnections();
test.runTest();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java?rev=887707&r1=887706&r2=887707&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java Sun Dec 6 16:28:35 2009
@@ -71,7 +71,7 @@
pipe.write(EOF_TOKEN);
if (dispatchQueue != null) {
RunnableCountDownLatch done = new RunnableCountDownLatch(1);
- dispatchQueue.setShutdownHandler(done);
+ dispatchQueue.addShutdownWatcher(done);
dispatchQueue.release();
done.await();
} else {

svn commit: r887687 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/java/org/apache/activemq/apollo/ activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-broker/src/test/java/org/apache/activemq/broker/ activ...

2009-12-06T06:40:36Z

Author: chirino
Date: Sun Dec 6 14:40:34 2009
New Revision: 887687

URL: http://svn.apache.org/viewvc?rev=887687&view=rev
Log:
Another round of renaming

Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherObserver.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatch.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchAware.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObserver.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java Sun Dec 6 14:40:34 2009
@@ -25,7 +25,7 @@
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.activemq.Service;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.transport.DispatchableTransport;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportListener;
@@ -42,7 +42,7 @@
protected int inputResumeThreshold = 512 * 1024;
protected boolean useAsyncWriteThread = true;

- private Dispatch dispatcher;
+ private Dispatcher dispatcher;
private final AtomicBoolean stopping = new AtomicBoolean();
private ExecutorService blockingWriter;
private ExceptionListener exceptionListener;
@@ -170,11 +170,11 @@
this.priorityLevels = priorityLevels;
}

- public Dispatch getDispatcher() {
+ public Dispatcher getDispatcher() {
return dispatcher;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java Sun Dec 6 14:40:34 2009
@@ -25,9 +25,9 @@

import org.apache.activemq.Service;
import org.apache.activemq.apollo.Connection;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
-import org.apache.activemq.dispatch.DispatchAware;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportAcceptListener;
import org.apache.activemq.transport.TransportServer;
@@ -51,7 +51,7 @@

private final LinkedHashMap<AsciiBuffer, VirtualHost> virtualHosts = new LinkedHashMap<AsciiBuffer, VirtualHost>();
private VirtualHost defaultVirtualHost;
- private Dispatch dispatcher;
+ private Dispatcher dispatcher;
private File dataDirectory;

private final class BrokerAcceptListener implements TransportAcceptListener {
@@ -129,7 +129,7 @@
// apply some default configuration to this broker instance before it's started.
if( dispatcher == null ) {
int threads = Runtime.getRuntime().availableProcessors();
- dispatcher = DispatchFactory.create(getName(), threads);
+ dispatcher = DispatcherFactory.create(getName(), threads);
}

@@ -376,10 +376,10 @@
// /////////////////////////////////////////////////////////////////
// Property Accessors
// /////////////////////////////////////////////////////////////////
- public Dispatch getDispatcher() {
+ public Dispatcher getDispatcher() {
return dispatcher;
}
- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
assertInConfigurationState();
this.dispatcher = dispatcher;
}
@@ -417,8 +417,8 @@

private void startTransportServer(TransportServer server) throws Exception {
server.setAcceptListener(new BrokerAcceptListener());
- if (server instanceof DispatchAware ) {
- ((DispatchAware) server).setDispatcher(dispatcher);
+ if (server instanceof DispatcherAware ) {
+ ((DispatcherAware) server).setDispatcher(dispatcher);
}
server.start();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java Sun Dec 6 14:40:34 2009
@@ -40,8 +40,8 @@
import org.apache.activemq.broker.store.Store.QueueQueryResult;
import org.apache.activemq.broker.store.Store.QueueRecord;
import org.apache.activemq.broker.store.Store.Session;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchAware;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.flow.AbstractLimitedFlowResource;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
@@ -60,7 +60,7 @@
import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;

-public class BrokerDatabase extends AbstractLimitedFlowResource<BrokerDatabase.OperationBase<?>> implements Service, DispatchAware {
+public class BrokerDatabase extends AbstractLimitedFlowResource<BrokerDatabase.OperationBase<?>> implements Service, DispatcherAware {

private static final boolean DEBUG = false;

@@ -71,7 +71,7 @@
private final FlowController<OperationBase<?>> storeController;
private final int FLUSH_QUEUE_SIZE = 10000 * 1024;

- private Dispatch dispatcher;
+ private Dispatcher dispatcher;
private Thread flushThread;
private AtomicBoolean running = new AtomicBoolean(false);
private DatabaseListener listener;
@@ -1288,11 +1288,11 @@
return store.allocateStoreTracking();
}

- public Dispatch getDispatcher() {
+ public Dispatcher getDispatcher() {
return dispatcher;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java Sun Dec 6 14:40:34 2009
@@ -24,7 +24,7 @@

import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.broker.store.Store.QueueQueryResult;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.flow.PrioritySizeLimiter;
import org.apache.activemq.flow.SizeLimiter;
@@ -52,7 +52,7 @@
private static final boolean USE_PRIORITY_QUEUES = true;

private BrokerDatabase database;
- private Dispatch dispatcher;
+ private Dispatcher dispatcher;

private static HashMap<String, ProtocolHandler> protocolHandlers = new HashMap<String, ProtocolHandler>();
private static final BrokerDatabase.MessageRecordMarshaller<MessageDelivery> MESSAGE_MARSHALLER = new BrokerDatabase.MessageRecordMarshaller<MessageDelivery>() {
@@ -226,7 +226,7 @@
this.database = database;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java Sun Dec 6 14:40:34 2009
@@ -30,8 +30,8 @@
import org.apache.activemq.apollo.broker.Router;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;
import org.apache.activemq.metric.MetricAggregator;
import org.apache.activemq.metric.Period;
import org.apache.activemq.transport.TransportFactory;
@@ -87,7 +87,7 @@
protected Broker sendBroker;
protected Broker rcvBroker;
protected ArrayList<Broker> brokers = new ArrayList<Broker>();
- protected Dispatch dispatcher;
+ protected Dispatcher dispatcher;
protected final AtomicLong msgIdGenerator = new AtomicLong();
protected final AtomicBoolean stopping = new AtomicBoolean();

@@ -134,8 +134,8 @@

protected abstract String getRemoteWireFormat();

- protected Dispatch createDispatcher() {
- return DispatchFactory.create("test", asyncThreadPoolSize);
+ protected Dispatcher createDispatcher() {
+ return DispatcherFactory.create("test", asyncThreadPoolSize);
}

@Test

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java Sun Dec 6 14:40:34 2009
@@ -26,8 +26,8 @@
import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;
import org.apache.activemq.queue.IQueue;

/**
@@ -37,7 +37,7 @@
public class SharedQueueTest extends TestCase {

- Dispatch dispatcher;
+ Dispatcher dispatcher;
BrokerDatabase database;
BrokerQueueStore queueStore;
private static final boolean USE_KAHA_DB = true;
@@ -46,8 +46,8 @@

protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();

- protected Dispatch createDispatcher() {
- return DispatchFactory.create("test", Runtime.getRuntime().availableProcessors());
+ protected Dispatcher createDispatcher() {
+ return DispatcherFactory.create("test", Runtime.getRuntime().availableProcessors());
}

protected int consumerStartDelay = 0;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java Sun Dec 6 14:40:34 2009
@@ -18,7 +18,7 @@

import java.nio.channels.SelectableChannel;

-import org.apache.activemq.dispatch.internal.simple.SimpleDispatchSPI;
+import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;

/**
*
@@ -26,34 +26,34 @@
*/
public class DispatchSystem {

- final private static Dispatch spi = create();
+ final private static Dispatcher dispatcher = create();

- private static Dispatch create() {
- return new SimpleDispatchSPI("system", Runtime.getRuntime().availableProcessors());
+ private static Dispatcher create() {
+ return new SimpleDispatcher("system", Runtime.getRuntime().availableProcessors());
}

static DispatchQueue getMainQueue() {
- return spi.getMainQueue();
+ return dispatcher.getMainQueue();
}

static public DispatchQueue getGlobalQueue() {
- return spi.getGlobalQueue();
+ return dispatcher.getGlobalQueue();
}

static public DispatchQueue getGlobalQueue(DispatchPriority priority) {
- return spi.getGlobalQueue(priority);
+ return dispatcher.getGlobalQueue(priority);
}

static DispatchQueue getSerialQueue(String label) {
- return spi.createSerialQueue(label);
+ return dispatcher.createSerialQueue(label);
}

static void dispatchMain() {
- spi.dispatchMain();
+ dispatcher.dispatchMain();
}

static DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue) {
- return spi.createSource(channel, interestOps, queue);
+ return dispatcher.createSource(channel, interestOps, queue);
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java?rev=887687&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java Sun Dec 6 14:40:34 2009
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch;
+
+import java.nio.channels.SelectableChannel;
+
+
+public interface Dispatcher extends Retained {
+
+ public void start();
+ public void shutdown(Runnable onShutdown);
+
+ public DispatchQueue getGlobalQueue();
+ public DispatchQueue getGlobalQueue(DispatchPriority priority);
+
+ public DispatchQueue createSerialQueue(String label);
+
+ public DispatchQueue getMainQueue();
+ public void dispatchMain();
+
+ public DispatchQueue getCurrentQueue();
+
+ public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue);
+
+}
\ No newline at end of file

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java?rev=887687&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java Sun Dec 6 14:40:34 2009
@@ -0,0 +1,14 @@
+package org.apache.activemq.dispatch;
+
+
+/**
+ * Handy interface to signal classes which would like an Dispatcher instance
+ * injected into them.
+ *
+ * @author chirino
+ */
+public interface DispatcherAware {
+
+ public void setDispatcher(Dispatcher dispatcher);
+
+}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java?rev=887687&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java Sun Dec 6 14:40:34 2009
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch;
+
+import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class DispatcherFactory {
+
+ public static Dispatcher create() {
+ return create("system", Runtime.getRuntime().availableProcessors());
+ }
+
+ public static Dispatcher create(String name, int threads) {
+ return new SimpleDispatcher(name, threads);
+ }
+
+}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherObserver.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherObserver.java?rev=887687&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherObserver.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherObserver.java Sun Dec 6 14:40:34 2009
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch;
+
+import org.apache.activemq.dispatch.internal.simple.DispatcherThread;
+
+public interface DispatcherObserver {
+
+ public void onThreadCreate(DispatcherThread thread);
+ public void onThreadDestroy(DispatcherThread thread);
+
+ public void onQueueCreate(DispatchQueue queue);
+ public void onQueueDestroy(DispatchQueue queue);
+
+ public void onSourceCreate(DispatchSource source);
+ public void onSourceDestroy(DispatchSource source);
+
+ public void onDispatchRequest(DispatchQueue target, Runnable request);
+
+}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java Sun Dec 6 14:40:34 2009
@@ -22,12 +22,12 @@
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;

-import static org.apache.activemq.dispatch.DispatchFactory.*;
+import static org.apache.activemq.dispatch.DispatcherFactory.*;

-import static org.apache.activemq.dispatch.DispatchFactory.*;
+import static org.apache.activemq.dispatch.DispatcherFactory.*;

/**
*

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java?rev=887687&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java Sun Dec 6 14:40:34 2009
@@ -0,0 +1,231 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch.internal.advanced;
+
+import java.nio.channels.SelectableChannel;
+import java.util.ArrayList;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatchPriority;
+import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatchSource;
+import org.apache.activemq.dispatch.internal.BaseRetained;
+import org.apache.activemq.dispatch.internal.SerialDispatchQueue;
+
+import static org.apache.activemq.dispatch.DispatchPriority.*;
+
+
+public class AdvancedDispatcher extends BaseRetained implements Dispatcher {
+
+ public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();
+
+ final SerialDispatchQueue mainQueue = new SerialDispatchQueue("main");
+ final GlobalDispatchQueue globalQueues[];
+ final AtomicLong globalQueuedRunnables = new AtomicLong();
+
+ private final ArrayList<DispatcherThread> dispatchers = new ArrayList<DispatcherThread>();
+
+ final AtomicInteger startCounter = new AtomicInteger();
+// final AtomicBoolean started = new AtomicBoolean();
+// final AtomicBoolean shutdown = new AtomicBoolean();
+
+ private int roundRobinCounter = 0;
+ private int size;
+ private final int numPriorities;
+
+ protected LoadBalancer loadBalancer;
+
+ public AdvancedDispatcher(int size, int numPriorities) {
+ this.size = size;
+ this.numPriorities = numPriorities;
+
+ globalQueues = new GlobalDispatchQueue[3];
+ for (int i = 0; i < 3; i++) {
+ globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i]);
+ }
+
+ loadBalancer = new SimpleLoadBalancer();
+ }
+
+ /**
+ * Subclasses should implement this to return a new dispatcher.
+ *
+ * @param name
+ * The name to assign the dispatcher.
+ * @param pool
+ * The pool.
+ * @return The new dispathcer.
+ */
+ protected DispatcherThread createDispatcher(String name) throws Exception {
+ return new DispatcherThread(this, name, numPriorities);
+ }
+
+ /**
+ * @see org.apache.activemq.dispatch.internal.advanced.DispatcherThread#start()
+ */
+ public synchronized final void start() {
+ if( startCounter.getAndIncrement()==0 ) {
+ // Create all the workers.
+ try {
+ loadBalancer.start();
+ for (int i = 0; i < size; i++) {
+ DispatcherThread dispatacher = createDispatcher("dispatcher -" + (i + 1));
+ dispatchers.add(dispatacher);
+ dispatacher.start();
+ }
+ } catch (Exception e) {
+ shutdown();
+ }
+ }
+ }
+
+ public final void shutdown() {
+ shutdown(null);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.activemq.dispatch.IDispatcher#shutdown()
+ */
+ public final void shutdown(Runnable onShutdown) {
+ if( startCounter.decrementAndGet()==0 ) {
+ final AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.size());
+ for (DispatcherThread d : new ArrayList<DispatcherThread>(dispatchers)) {
+ d.shutdown(shutdownCountDown, onShutdown);
+ }
+ loadBalancer.stop();
+ }
+ }
+
+ /**
+ * A Dispatcher must call this to indicate that is has started it's dispatch
+ * loop.
+ */
+ public void onDispatcherStarted(DispatcherThread d) {
+ DispatcherThread.CURRENT.set(d);
+ loadBalancer.onDispatcherStarted(d);
+ }
+
+ public LoadBalancer getLoadBalancer() {
+ return loadBalancer;
+ }
+
+ /**
+ * A Dispatcher must call this when exiting it's dispatch loop
+ */
+ public void onDispatcherStopped(DispatcherThread d) {
+ synchronized (dispatchers) {
+ if (dispatchers.remove(d)) {
+ size--;
+ }
+ }
+ loadBalancer.onDispatcherStopped(d);
+ }
+
+ protected DispatcherThread chooseDispatcher() {
+ DispatcherThread d = DispatcherThread.CURRENT.get();
+ if (d == null) {
+ synchronized (dispatchers) {
+ if(dispatchers.isEmpty())
+ {
+ throw new RejectedExecutionException();
+ }
+ if (++roundRobinCounter >= size) {
+ roundRobinCounter = 0;
+ }
+ return dispatchers.get(roundRobinCounter);
+ }
+ } else {
+ return d;
+ }
+ }
+
+// public DispatchContext register(Runnable runnable, String name) {
+// return chooseDispatcher().register(runnable, name);
+// }
+
+ public int getSize() {
+ return size;
+ }
+
+ public final Executor createPriorityExecutor(final int priority) {
+ return new Executor() {
+ public void execute(final Runnable runnable) {
+ chooseDispatcher().dispatch(runnable, priority);
+ }
+
+ };
+ }
+
+ public int getDispatchPriorities() {
+ // TODO Auto-generated method stub
+ return numPriorities;
+ }
+
+ public void execute(Runnable command) {
+ chooseDispatcher().dispatch(command, 0);
+ }
+
+ public void execute(Runnable command, int priority) {
+ chooseDispatcher().dispatch(command, priority);
+ }
+
+ public void schedule(final Runnable runnable, long delay, TimeUnit timeUnit) {
+ chooseDispatcher().schedule(runnable, delay, timeUnit);
+ }
+
+ public void schedule(final Runnable runnable, int priority, long delay, TimeUnit timeUnit) {
+ chooseDispatcher().schedule(runnable, priority, delay, timeUnit);
+ }
+
+ public DispatchQueue getMainQueue() {
+ return mainQueue;
+ }
+
+ public DispatchQueue getGlobalQueue() {
+ return getGlobalQueue(DEFAULT);
+ }
+
+ public DispatchQueue getGlobalQueue(DispatchPriority priority) {
+ return globalQueues[priority.ordinal()];
+ }
+
+ public DispatchQueue createSerialQueue(String label) {
+ AdvancedSerialDispatchQueue rc = new AdvancedSerialDispatchQueue(label);
+ rc.setTargetQueue(getGlobalQueue());
+ return rc;
+ }
+
+ public void dispatchMain() {
+ mainQueue.run();
+ }
+
+ public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue) {
+ return null;
+ }
+
+ public DispatchQueue getCurrentQueue() {
+ return CURRENT_QUEUE.get();
+ }
+
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java Sun Dec 6 14:40:34 2009
@@ -38,8 +38,8 @@
this.runnable = runnable;
this.label = label;
this.target = thread;
- if (persistent && target.spi != null) {
- this.tracker = target.spi.getLoadBalancer().createExecutionTracker((DispatchContext) this);
+ if (persistent && target.dispatcher != null) {
+ this.tracker = target.dispatcher.getLoadBalancer().createExecutionTracker((DispatchContext) this);
} else {
this.tracker = null;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java Sun Dec 6 14:40:34 2009
@@ -30,7 +30,7 @@
import org.apache.activemq.util.TimerHeap;
import org.apache.activemq.util.list.LinkedNodeList;

-import static org.apache.activemq.dispatch.DispatchFactory.*;
+import static org.apache.activemq.dispatch.DispatcherFactory.*;

public class DispatcherThread implements Runnable {

@@ -46,7 +46,7 @@
protected final HashSet<DispatchContext> contexts = new HashSet<DispatchContext>();

// Set if this dispatcher is part of a dispatch pool:
- protected final AdvancedDispatchSPI spi;
+ protected final AdvancedDispatcher dispatcher;

// The local dispatch queue:
protected final PriorityLinkedList<DispatchContext> priorityQueue;
@@ -75,7 +75,7 @@
}
};

- protected DispatcherThread(AdvancedDispatchSPI spi, String name, int priorities) {
+ protected DispatcherThread(AdvancedDispatcher dispatcher, String name, int priorities) {
this.name = name;

this.dispatchQueues = new ThreadDispatchQueue[3];
@@ -88,7 +88,7 @@
for (int i = 0; i < 2; i++) {
foreignQueue[i] = new LinkedNodeList<ForeignEvent>();
}
- this.spi = spi;
+ this.dispatcher = dispatcher;
}

@SuppressWarnings("unchecked")
@@ -176,7 +176,7 @@

public void run() {

- spi.onDispatcherStarted((DispatcherThread) this);
+ dispatcher.onDispatcherStarted((DispatcherThread) this);
DispatchContext pdc;
try {
while (running) {
@@ -184,7 +184,7 @@
// If no local work available wait for foreign work:
while((pdc = priorityQueue.poll())!=null){
if( pdc.priority < dispatchQueues.length ) {
- AdvancedDispatchSPI.CURRENT_QUEUE.set(dispatchQueues[pdc.priority]);
+ AdvancedDispatcher.CURRENT_QUEUE.set(dispatchQueues[pdc.priority]);
}

if (pdc.tracker != null) {
@@ -235,7 +235,7 @@
} catch (Throwable thrown) {
thrown.printStackTrace();
} finally {
- spi.onDispatcherStopped((DispatcherThread) this);
+ dispatcher.onDispatcherStopped((DispatcherThread) this);
cleanup();
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java Sun Dec 6 14:40:34 2009
@@ -29,11 +29,11 @@
public class GlobalDispatchQueue implements DispatchQueue {

private final String label;
- private final AdvancedDispatchSPI spi;
+ private final AdvancedDispatcher dispatcher;
private final DispatchPriority priority;

- public GlobalDispatchQueue(AdvancedDispatchSPI spi, DispatchPriority priority) {
- this.spi = spi;
+ public GlobalDispatchQueue(AdvancedDispatcher dispatcher, DispatchPriority priority) {
+ this.dispatcher = dispatcher;
this.priority = priority;
this.label=priority.toString();
}
@@ -47,11 +47,11 @@
}

public void dispatchAsync(Runnable runnable) {
- spi.execute(runnable, priority.ordinal());
+ dispatcher.execute(runnable, priority.ordinal());
}

public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
- spi.schedule(runnable, priority.ordinal(), delay, TimeUnit.MILLISECONDS);
+ dispatcher.schedule(runnable, priority.ordinal(), delay, TimeUnit.MILLISECONDS);
}

public void dispatchSync(final Runnable runnable) throws InterruptedException {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java Sun Dec 6 14:40:34 2009
@@ -27,17 +27,17 @@
*/
final public class DispatcherThread extends Thread {
private static final int MAX_DISPATCH_BEFORE_CHECKING_FOR_HIGHER_PRIO = 10000;
- private final SimpleDispatchSPI spi;
+ private final SimpleDispatcher dispatcher;
final ThreadDispatchQueue[] threadQueues;
final AtomicLong threadQueuedRunnables = new AtomicLong();

- public DispatcherThread(SimpleDispatchSPI spi, int ordinal) {
- this.spi = spi;
+ public DispatcherThread(SimpleDispatcher dispatcher, int ordinal) {
+ this.dispatcher = dispatcher;
this.threadQueues = new ThreadDispatchQueue[3];
for (int i = 0; i < 3; i++) {
threadQueues[i] = new ThreadDispatchQueue(this, DispatchPriority.values()[i] );
}
- setName(spi.getLabel()+" dispatcher: "+(ordinal+1));
+ setName(dispatcher.getLabel()+" dispatcher: "+(ordinal+1));
setDaemon(true);
}

@@ -47,7 +47,7 @@
outer: while( true ) {
int counter=0;
for (SimpleQueue queue : threadQueues) {
- SimpleDispatchSPI.CURRENT_QUEUE.set(queue);
+ SimpleDispatcher.CURRENT_QUEUE.set(queue);
Runnable runnable;
while( (runnable = queue.poll())!=null ) {
dispatch(runnable);
@@ -60,8 +60,8 @@
continue;
}

- for (SimpleQueue queue : spi.globalQueues) {
- SimpleDispatchSPI.CURRENT_QUEUE.set(threadQueues[queue.getPriority().ordinal()]);
+ for (SimpleQueue queue : dispatcher.globalQueues) {
+ SimpleDispatcher.CURRENT_QUEUE.set(threadQueues[queue.getPriority().ordinal()]);

Runnable runnable;
while( (runnable = queue.poll())!=null ) {
@@ -80,7 +80,7 @@
continue;
}

-// GlobalDispatchQueue[] globalQueues = spi.globalQueues;
+// GlobalDispatchQueue[] globalQueues = dispatcher.globalQueues;
// while( true ) {
//
// if( dispatch(threadQueues[0])
@@ -117,7 +117,7 @@
break;
}
if( counter==0 ) {
- SimpleDispatchSPI.CURRENT_QUEUE.set(queue);
+ SimpleDispatcher.CURRENT_QUEUE.set(queue);
}
dispatch(runnable);
counter++;
@@ -139,10 +139,10 @@
private boolean inWaitingList;

private void waitForWakeup() throws InterruptedException {
- while( threadQueuedRunnables.get()==0 && spi.globalQueuedRunnables.get()==0 ) {
+ while( threadQueuedRunnables.get()==0 && dispatcher.globalQueuedRunnables.get()==0 ) {
synchronized(wakeupMutex) {
if( !inWaitingList ) {
- spi.addWaitingDispatcher(this);
+ dispatcher.addWaitingDispatcher(this);
inWaitingList=true;
}
wakeupMutex.wait();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java Sun Dec 6 14:40:34 2009
@@ -30,17 +30,17 @@
*/
public class GlobalDispatchQueue implements SimpleQueue {

- private final SimpleDispatchSPI spi;
+ private final SimpleDispatcher dispatcher;
final String label;
final ConcurrentLinkedQueue<Runnable> runnables = new ConcurrentLinkedQueue<Runnable>();
final AtomicLong counter;
private final DispatchPriority priority;

- public GlobalDispatchQueue(SimpleDispatchSPI spi, DispatchPriority priority) {
- this.spi = spi;
+ public GlobalDispatchQueue(SimpleDispatcher dispatcher, DispatchPriority priority) {
+ this.dispatcher = dispatcher;
this.priority = priority;
this.label=priority.toString();
- this.counter = spi.globalQueuedRunnables;
+ this.counter = dispatcher.globalQueuedRunnables;
}

public String getLabel() {
@@ -54,11 +54,11 @@
public void dispatchAsync(Runnable runnable) {
this.counter.incrementAndGet();
runnables.add(runnable);
- spi.wakeup();
+ dispatcher.wakeup();
}

public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
- spi.timerThread.addRelative(runnable, this, delay, unit);
+ dispatcher.timerThread.addRelative(runnable, this, delay, unit);
}

public void dispatchSync(final Runnable runnable) throws InterruptedException {

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java?rev=887687&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java Sun Dec 6 14:40:34 2009
@@ -0,0 +1,152 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch.internal.simple;
+
+import java.nio.channels.SelectableChannel;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatchPriority;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatchSource;
+import org.apache.activemq.dispatch.internal.BaseRetained;
+import org.apache.activemq.dispatch.internal.SerialDispatchQueue;
+
+import static org.apache.activemq.dispatch.DispatchPriority.*;
+
+
+
+/**
+ * Implements a simple dispatch system.
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class SimpleDispatcher extends BaseRetained implements Dispatcher {
+
+ public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();
+
+ final SerialDispatchQueue mainQueue = new SerialDispatchQueue("main");
+ final GlobalDispatchQueue globalQueues[];
+ final DispatcherThread dispatchers[];
+ final AtomicLong globalQueuedRunnables = new AtomicLong();
+
+ final ConcurrentLinkedQueue<DispatcherThread> waitingDispatchers = new ConcurrentLinkedQueue<DispatcherThread>();
+ final AtomicInteger waitingDispatcherCount = new AtomicInteger();
+ final AtomicInteger startCounter = new AtomicInteger();
+ private final String label;
+ TimerThread timerThread;
+
+ public SimpleDispatcher(String label, int size) {
+ this.label = label;
+ globalQueues = new GlobalDispatchQueue[3];
+ for (int i = 0; i < 3; i++) {
+ globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i] );
+ }
+ dispatchers = new DispatcherThread[size];
+ }
+
+ public DispatchQueue getMainQueue() {
+ return mainQueue;
+ }
+
+ public DispatchQueue getGlobalQueue() {
+ return getGlobalQueue(DEFAULT);
+ }
+
+ public DispatchQueue getGlobalQueue(DispatchPriority priority) {
+ return globalQueues[priority.ordinal()];
+ }
+
+ public DispatchQueue createSerialQueue(String label) {
+ SerialDispatchQueue rc = new SerialDispatchQueue(label) {
+ @Override
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
+ timerThread.addRelative(runnable, this, delay, unit);
+ }
+ };
+ rc.setTargetQueue(getGlobalQueue());
+ return rc;
+ }
+
+ public void dispatchMain() {
+ mainQueue.run();
+ }
+
+ public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue) {
+ return null;
+ }
+
+ public void addWaitingDispatcher(DispatcherThread dispatcher) {
+ waitingDispatcherCount.incrementAndGet();
+ waitingDispatchers.add(dispatcher);
+ }
+
+ public void wakeup() {
+ int value = waitingDispatcherCount.get();
+ if( value!=0 ) {
+ DispatcherThread dispatcher = waitingDispatchers.poll();
+ if( dispatcher!=null ) {
+ waitingDispatcherCount.decrementAndGet();
+ dispatcher.globalWakeup();
+ }
+ }
+ }
+
+ public void start() {
+ if( startCounter.getAndIncrement()==0 ) {
+ for (int i = 0; i < dispatchers.length; i++) {
+ dispatchers[i] = new DispatcherThread(this, i);
+ dispatchers[i].start();
+ }
+ timerThread = new TimerThread(this);
+ timerThread.start();
+ }
+ }
+
+ public void shutdown(final Runnable onShutdown) {
+ if( startCounter.decrementAndGet()==0 ) {
+
+ final AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.length+1);
+ Runnable wrapper = new Runnable() {
+ public void run() {
+ if( shutdownCountDown.decrementAndGet()==0 && onShutdown!=null) {
+ onShutdown.run();
+ }
+ throw new DispatcherThread.Shutdown();
+ }
+ };
+
+ timerThread.shutdown(wrapper);
+ for (int i = 0; i < dispatchers.length; i++) {
+ ThreadDispatchQueue queue = dispatchers[i].threadQueues[LOW.ordinal()];
+ queue.runnables.add(wrapper);
+ }
+ }
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public DispatchQueue getCurrentQueue() {
+ return CURRENT_QUEUE.get();
+ }
+
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java Sun Dec 6 14:40:34 2009
@@ -25,8 +25,8 @@
private final Object mutex = new Object();
private ArrayList<TimerRequest> requests = new ArrayList<TimerRequest>();

- public TimerThread(SimpleDispatchSPI spi) {
- setName(spi.getLabel()+" timer");
+ public TimerThread(SimpleDispatcher dispatcher) {
+ setName(dispatcher.getLabel()+" timer");
setDaemon(true);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Sun Dec 6 14:40:34 2009
@@ -13,8 +13,8 @@
import junit.framework.TestCase;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatcher;

/**
@@ -45,7 +45,7 @@

public void testActorInvocation() throws Exception
{
- Dispatch advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
advancedSystem.start();

DispatchQueue queue = advancedSystem.createSerialQueue("test");

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java Sun Dec 6 14:40:34 2009
@@ -19,8 +19,8 @@
import java.util.concurrent.CountDownLatch;

import org.apache.activemq.dispatch.internal.RunnableCountDownLatch;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.simple.SimpleDispatchSPI;
+import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatcher;
+import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;

import static org.apache.activemq.dispatch.DispatchPriority.*;

@@ -33,7 +33,7 @@
public class DispatchSystemTest {

public static void main(String[] args) throws Exception {
- Dispatch advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
advancedSystem.start();
benchmark("advanced global queue", advancedSystem, advancedSystem.getGlobalQueue(DEFAULT));
benchmark("advanced private serial queue", advancedSystem, advancedSystem.createSerialQueue("test"));
@@ -42,7 +42,7 @@
advancedSystem.shutdown(latch);
latch.await();

- Dispatch simpleSystem = new SimpleDispatchSPI("test", Runtime.getRuntime().availableProcessors());
+ Dispatcher simpleSystem = new SimpleDispatcher("test", Runtime.getRuntime().availableProcessors());
simpleSystem.start();

benchmark("simple global queue", simpleSystem, simpleSystem.getGlobalQueue(DEFAULT));
@@ -53,13 +53,13 @@
latch.await();
}

- private static void benchmark(String name, Dispatch spi, DispatchQueue queue) throws InterruptedException {
+ private static void benchmark(String name, Dispatcher dispatcher, DispatchQueue queue) throws InterruptedException {
// warm the JIT up..
- benchmarkWork(spi, queue, 100000);
+ benchmarkWork(dispatcher, queue, 100000);

int iterations = 1000*1000*20;
long start = System.nanoTime();
- benchmarkWork(spi, queue, iterations);
+ benchmarkWork(dispatcher, queue, iterations);
long end = System.nanoTime();

double durationMS = 1.0d*(end-start)/1000000d;
@@ -68,13 +68,13 @@
System.out.println(format("name: %s, duration: %,.3f ms, rate: %,.2f executions/sec", name, durationMS, rate));
}

- private static void benchmarkWork(final Dispatch spi, final DispatchQueue queue, int iterations) throws InterruptedException {
+ private static void benchmarkWork(final Dispatcher dispatcher, final DispatchQueue queue, int iterations) throws InterruptedException {
final CountDownLatch counter = new CountDownLatch(iterations);
Runnable task = new Runnable(){
public void run() {
counter.countDown();
if( counter.getCount()>0 ) {
- spi.getCurrentQueue().dispatchAsync(this);
+ dispatcher.getCurrentQueue().dispatchAsync(this);
}
}
};

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java Sun Dec 6 14:40:34 2009
@@ -30,7 +30,7 @@
public class DispatcherPoolTest {

public static void main(String[] args) throws Exception {
- AdvancedDispatchSPI pooledDispatcher = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
+ AdvancedDispatcher pooledDispatcher = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
pooledDispatcher.start();

// warm the JIT up..
@@ -48,7 +48,7 @@
System.out.println(format("duration: %,.3f ms, rate: %,.2f executions/sec", durationMS, rate));
}

- private static void benchmarkWork(final AdvancedDispatchSPI pooledDispatcher, int iterations) throws InterruptedException {
+ private static void benchmarkWork(final AdvancedDispatcher pooledDispatcher, int iterations) throws InterruptedException {
final CountDownLatch counter = new CountDownLatch(iterations);
for (int i = 0; i < 1000; i++) {
Work dispatchable = new Work(counter, pooledDispatcher);
@@ -61,9 +61,9 @@
private final CountDownLatch counter;
private final DispatchQueue dispatchQueue;

- private Work(CountDownLatch counter, AdvancedDispatchSPI spi) {
+ private Work(CountDownLatch counter, AdvancedDispatcher dispatcher) {
this.counter = counter;
- dispatchQueue = spi.createSerialQueue("test");
+ dispatchQueue = dispatcher.createSerialQueue("test");
}

public void run() {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java Sun Dec 6 14:40:34 2009
@@ -22,8 +22,8 @@
import javax.xml.bind.annotation.XmlRootElement;

import org.apache.activemq.apollo.broker.Broker;
-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;

@XmlRootElement(name="dispatcher")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -36,11 +36,11 @@
@XmlAttribute(required=false)
int threads = Runtime.getRuntime().availableProcessors();

- public Dispatch createDispatcher(BrokerXml brokerXml) {
+ public Dispatcher createDispatcher(BrokerXml brokerXml) {
if( name == null ) {
name = "broker";
}
- return DispatchFactory.create(name, threads);
+ return DispatcherFactory.create(name, threads);
}

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java Sun Dec 6 14:40:34 2009
@@ -26,7 +26,7 @@
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.broker.store.memory.MemoryStore;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
@@ -44,7 +44,7 @@
LOG.info("Loading broker configuration from the classpath with URI: " + uri);
Broker broker = BrokerFactory.createBroker(uri);

- Dispatch p = (Dispatch)broker.getDispatcher();
+ Dispatcher p = (Dispatcher)broker.getDispatcher();
// assertEquals(4, p.getSize());
// assertEquals("test dispatcher", p.getName());

Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java Sun Dec 6 14:40:34 2009
@@ -38,10 +38,10 @@
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.MessageId;
import org.apache.activemq.command.ProducerId;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.DispatcherFactory;
import org.apache.activemq.flow.AbstractLimitedFlowResource;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
@@ -65,7 +65,7 @@

private static int PERFORMANCE_SAMPLES = 5;

- Dispatch dispatcher;
+ Dispatcher dispatcher;
BrokerDatabase database;
BrokerQueueStore queueStore;
private static final boolean USE_KAHA_DB = true;
@@ -82,8 +82,8 @@
protected ArrayList<Producer> producers = new ArrayList<Producer>();
protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();

- protected Dispatch createDispatcher() {
- return DispatchFactory.create("pref-test", THREAD_POOL_SIZE);
+ protected Dispatcher createDispatcher() {
+ return DispatcherFactory.create("pref-test", THREAD_POOL_SIZE);
}

protected int consumerStartDelay = 0;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java Sun Dec 6 14:40:34 2009
@@ -21,7 +21,7 @@

import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.flow.ISinkController.FlowControllable;

/**
@@ -32,7 +32,7 @@
*/
public abstract class AbstractFlowQueue<E> extends AbstractFlowRelay<E> implements FlowControllable<E>, IFlowQueue<E> {

- protected Dispatch dispatcher;
+ protected Dispatcher dispatcher;
protected Collection<IPollableFlowSource.FlowReadyListener<E>> readyListeners;
private boolean notifyReady = false;
protected int dispatchPriority = 0;
@@ -132,7 +132,7 @@
* @param dispatcher
* The dispatcher to handle messages.
*/
- public synchronized void setDispatcher(Dispatch dispatcher) {
+ public synchronized void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;

dispatchQueue = dispatcher.createSerialQueue(getResourceName());

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java Sun Dec 6 14:40:34 2009
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.queue;

-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.flow.IFlowRelay;

public interface IFlowQueue<E> extends IBlockingFlowSource<E>, IPollableFlowSource<E>, IFlowRelay<E> {
@@ -57,7 +57,7 @@
* @param dispatcher
* The dispatcher to be used by the queue.
*/
- public void setDispatcher(Dispatch dispatcher);
+ public void setDispatcher(Dispatcher dispatcher);

/**
* Sets the base dispatch priority for the queue. Setting to higher value

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java Sun Dec 6 14:40:34 2009
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.queue;

-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.queue.QueueStore.PersistentQueue;
import org.apache.activemq.util.Mapper;

@@ -47,7 +47,7 @@
* @param dispatcher
* The dispatcher to be used by the queue.
*/
- public void setDispatcher(Dispatch dispatcher);
+ public void setDispatcher(Dispatcher dispatcher);

/**
* Sets the base dispatch priority for the queue. Setting to higher value

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java Sun Dec 6 14:40:34 2009
@@ -21,7 +21,7 @@
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;

-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.util.Mapper;
import org.apache.activemq.util.buffer.AsciiBuffer;
@@ -31,7 +31,7 @@
protected HashSet<Subscription<V>> subscriptions = new HashSet<Subscription<V>>();
private HashMap<Integer, IQueue<K, V>> partitions = new HashMap<Integer, IQueue<K, V>>();
protected QueueStore<K, V> store;
- protected Dispatch dispatcher;
+ protected Dispatcher dispatcher;
protected boolean started;
protected boolean shutdown = false;
protected QueueDescriptor queueDescriptor;
@@ -253,7 +253,7 @@
this.autoRelease = autoRelease;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
checkShutdown();
this.dispatcher = dispatcher;
synchronized (this) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java Sun Dec 6 14:40:34 2009
@@ -11,7 +11,7 @@
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.flow.AbstractLimiter;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.IFlowLimiter;
@@ -66,12 +66,12 @@
private final int inputWindowSize = 1000;
private final int inputResumeThreshold = 500;

- private Dispatch dispatcher;
+ private Dispatcher dispatcher;
private final AtomicBoolean stopping = new AtomicBoolean(false);
protected boolean blockingTransport = false;
ExecutorService blockingWriter;

- public static void setInShutdown(boolean val, Dispatch dispatcher) {
+ public static void setInShutdown(boolean val, Dispatcher dispatcher) {
if (val != inShutdown.getAndSet(val)) {
if (val) {
if (USE_RATE_BASED_LIMITER) {
@@ -275,11 +275,11 @@
this.priorityLevels = priorityLevels;
}

- public Dispatch getDispatcher() {
+ public Dispatcher getDispatcher() {
return dispatcher;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;
}

@@ -456,12 +456,12 @@

protected static class RateBasedLimiterCollector implements Runnable {

- private Dispatch dispatcher;
+ private Dispatcher dispatcher;
private int samplingPeriod = 50;
private boolean scheduled = false;
private HashSet<RateBasedLimiter> limiters = new HashSet<RateBasedLimiter>();

- public synchronized void setDispatcher(Dispatch d) {
+ public synchronized void setDispatcher(Dispatcher d) {
if (d != dispatcher) {
scheduled = false;
dispatcher = d;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java Sun Dec 6 14:40:34 2009
@@ -21,9 +21,9 @@
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicBoolean;

-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
-import org.apache.activemq.dispatch.DispatchAware;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.flow.IFlowSink;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.transport.Transport;
@@ -53,7 +53,7 @@
private TransportServer transportServer;
private String uri;
private String name;
- protected Dispatch dispatcher;
+ protected Dispatcher dispatcher;
private final AtomicBoolean stopping = new AtomicBoolean();
private boolean useInputQueues = false;

@@ -125,8 +125,8 @@

transportServer = TransportFactory.bind(new URI(uri));
transportServer.setAcceptListener(this);
- if (transportServer instanceof DispatchAware) {
- ((DispatchAware) transportServer).setDispatcher(dispatcher);
+ if (transportServer instanceof DispatcherAware) {
+ ((DispatcherAware) transportServer).setDispatcher(dispatcher);
}
transportServer.start();

@@ -159,7 +159,7 @@
error.printStackTrace();
}

- public Dispatch getDispatcher() {
+ public Dispatcher getDispatcher() {
return dispatcher;
}

@@ -167,7 +167,7 @@
this.name = name;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;
}

@@ -189,7 +189,7 @@

protected void createDispatcher() {
if (dispatcher == null) {
- dispatcher = DispatchFactory.create("mock-broker", Runtime.getRuntime().availableProcessors());
+ dispatcher = DispatcherFactory.create("mock-broker", Runtime.getRuntime().availableProcessors());
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java Sun Dec 6 14:40:34 2009
@@ -20,8 +20,8 @@

import junit.framework.TestCase;

-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -63,7 +63,7 @@
protected MockBroker rcvBroker;
protected MockClient client;

- protected Dispatch dispatcher;
+ protected Dispatcher dispatcher;

static public final Mapper<Long, Message> KEY_MAPPER = new Mapper<Long, Message>() {
public Long map(Message element) {
@@ -94,8 +94,8 @@
}
}

- protected Dispatch createDispatcher(String name) {
- return DispatchFactory.create("test", threadsPerDispatcher);
+ protected Dispatcher createDispatcher(String name) {
+ return DispatcherFactory.create("test", threadsPerDispatcher);
}

public void test_1_1_0() throws Exception {
@@ -284,7 +284,7 @@
}
}

- Dispatch clientDispatcher = null;
+ Dispatcher clientDispatcher = null;
if (SEPARATE_CLIENT_DISPATCHER) {
clientDispatcher = createDispatcher("ClientDispatcher");
clientDispatcher.start();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java Sun Dec 6 14:40:34 2009
@@ -7,8 +7,8 @@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicLong;

-import org.apache.activemq.dispatch.Dispatch;
-import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherFactory;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -43,7 +43,7 @@
protected ArrayList<MetricCounter> additionalReportMetrics = new ArrayList<MetricCounter>();
protected boolean includeDetailedRates = false;

- protected Dispatch dispatcher;
+ protected Dispatcher dispatcher;

public RemoteConsumer consumer(int index) {
return consumers.get(index);
@@ -214,7 +214,7 @@
return testName;
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
this.dispatcher = dispatcher;
}

@@ -274,13 +274,13 @@
}
}

- public Dispatch getDispatcher() {
+ public Dispatcher getDispatcher() {
return dispatcher;
}

- protected Dispatch createDispatcher() {
+ protected Dispatcher createDispatcher() {
if (dispatcher == null) {
- dispatcher = DispatchFactory.create("client", threadsPerDispatcher);
+ dispatcher = DispatcherFactory.create("client", threadsPerDispatcher);
}
return dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java Sun Dec 6 14:40:34 2009
@@ -17,9 +17,9 @@
package org.apache.activemq.transport;

import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.DispatchAware;
+import org.apache.activemq.dispatch.DispatcherAware;

-public interface DispatchableTransport extends Transport, DispatchAware {
+public interface DispatchableTransport extends Transport, DispatcherAware {

public void setDispatchPriority(DispatchPriority priority);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java?rev=887687&r1=887686&r2=887687&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java Sun Dec 6 14:40:34 2009
@@ -14,9 +14,9 @@
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.internal.RunnableCountDownLatch;
import org.apache.activemq.transport.DispatchableTransport;
import org.apache.activemq.transport.FutureResponse;
@@ -82,7 +82,7 @@
}
}

- public void setDispatcher(Dispatch dispatcher) {
+ public void setDispatcher(Dispatcher dispatcher) {
dispatchQueue = dispatcher.createSerialQueue(name);
dispatchTask = new Runnable(){
public void run() {

svn commit: r887686 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/java/org/apache/activemq/apollo/ activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-broker/src/test/java/org/apache/activemq/broker/ activ...

2009-12-06T06:32:40Z

Author: chirino
Date: Sun Dec 6 14:32:37 2009
New Revision: 887686

URL: http://svn.apache.org/viewvc?rev=887686&view=rev
Log:
Refactor for better dispatch package class names

Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatch.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchAware.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObserver.java
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatchObserver.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java Sun Dec 6 14:32:37 2009
@@ -25,8 +25,7 @@
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.activemq.Service;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.transport.DispatchableTransport;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportListener;
@@ -43,7 +42,7 @@
protected int inputResumeThreshold = 512 * 1024;
protected boolean useAsyncWriteThread = true;

- private AdvancedDispatchSPI dispatcher;
+ private Dispatch dispatcher;
private final AtomicBoolean stopping = new AtomicBoolean();
private ExecutorService blockingWriter;
private ExceptionListener exceptionListener;
@@ -171,11 +170,11 @@
this.priorityLevels = priorityLevels;
}

- public AdvancedDispatchSPI getDispatcher() {
+ public Dispatch getDispatcher() {
return dispatcher;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java Sun Dec 6 14:32:37 2009
@@ -25,11 +25,9 @@

import org.apache.activemq.Service;
import org.apache.activemq.apollo.Connection;
-import org.apache.activemq.dispatch.DispatcherAware;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.DispatchAware;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportAcceptListener;
import org.apache.activemq.transport.TransportServer;
@@ -53,7 +51,7 @@

private final LinkedHashMap<AsciiBuffer, VirtualHost> virtualHosts = new LinkedHashMap<AsciiBuffer, VirtualHost>();
private VirtualHost defaultVirtualHost;
- private AdvancedDispatchSPI dispatcher;
+ private Dispatch dispatcher;
private File dataDirectory;

private final class BrokerAcceptListener implements TransportAcceptListener {
@@ -131,7 +129,7 @@
// apply some default configuration to this broker instance before it's started.
if( dispatcher == null ) {
int threads = Runtime.getRuntime().availableProcessors();
- dispatcher = new AdvancedDispatchSPI(threads, Broker.MAX_PRIORITY);
+ dispatcher = DispatchFactory.create(getName(), threads);
}

@@ -186,9 +184,9 @@
for (VirtualHost virtualHost : virtualHosts.values()) {
stop(virtualHost);
}
- dispatcher.shutdown();
+
+ dispatcher.release();
state.set(State.STOPPED);
-
}

// /////////////////////////////////////////////////////////////////
@@ -378,10 +376,10 @@
// /////////////////////////////////////////////////////////////////
// Property Accessors
// /////////////////////////////////////////////////////////////////
- public AdvancedDispatchSPI getDispatcher() {
+ public Dispatch getDispatcher() {
return dispatcher;
}
- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
assertInConfigurationState();
this.dispatcher = dispatcher;
}
@@ -419,8 +417,8 @@

private void startTransportServer(TransportServer server) throws Exception {
server.setAcceptListener(new BrokerAcceptListener());
- if (server instanceof DispatcherAware ) {
- ((DispatcherAware) server).setDispatcher(dispatcher);
+ if (server instanceof DispatchAware ) {
+ ((DispatchAware) server).setDispatcher(dispatcher);
}
server.start();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java Sun Dec 6 14:32:37 2009
@@ -40,8 +40,8 @@
import org.apache.activemq.broker.store.Store.QueueQueryResult;
import org.apache.activemq.broker.store.Store.QueueRecord;
import org.apache.activemq.broker.store.Store.Session;
-import org.apache.activemq.dispatch.DispatcherAware;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchAware;
import org.apache.activemq.flow.AbstractLimitedFlowResource;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
@@ -60,7 +60,7 @@
import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;

-public class BrokerDatabase extends AbstractLimitedFlowResource<BrokerDatabase.OperationBase<?>> implements Service, DispatcherAware {
+public class BrokerDatabase extends AbstractLimitedFlowResource<BrokerDatabase.OperationBase<?>> implements Service, DispatchAware {

private static final boolean DEBUG = false;

@@ -71,7 +71,7 @@
private final FlowController<OperationBase<?>> storeController;
private final int FLUSH_QUEUE_SIZE = 10000 * 1024;

- private AdvancedDispatchSPI dispatcher;
+ private Dispatch dispatcher;
private Thread flushThread;
private AtomicBoolean running = new AtomicBoolean(false);
private DatabaseListener listener;
@@ -328,7 +328,7 @@

if (requestedDelayedFlushPointer == -1) {
requestedDelayedFlushPointer = delayedFlushPointer;
- dispatcher.schedule(flushDelayCallback, flushDelay, TimeUnit.MILLISECONDS);
+ dispatcher.getGlobalQueue().dispatchAfter(flushDelayCallback, flushDelay, TimeUnit.MILLISECONDS);
}

}
@@ -1288,11 +1288,11 @@
return store.allocateStoreTracking();
}

- public AdvancedDispatchSPI getDispatcher() {
+ public Dispatch getDispatcher() {
return dispatcher;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java Sun Dec 6 14:32:37 2009
@@ -24,7 +24,7 @@

import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.broker.store.Store.QueueQueryResult;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.flow.PrioritySizeLimiter;
import org.apache.activemq.flow.SizeLimiter;
@@ -52,7 +52,7 @@
private static final boolean USE_PRIORITY_QUEUES = true;

private BrokerDatabase database;
- private AdvancedDispatchSPI dispatcher;
+ private Dispatch dispatcher;

private static HashMap<String, ProtocolHandler> protocolHandlers = new HashMap<String, ProtocolHandler>();
private static final BrokerDatabase.MessageRecordMarshaller<MessageDelivery> MESSAGE_MARSHALLER = new BrokerDatabase.MessageRecordMarshaller<MessageDelivery>() {
@@ -226,7 +226,7 @@
this.database = database;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java Sun Dec 6 14:32:37 2009
@@ -30,9 +30,8 @@
import org.apache.activemq.apollo.broker.Router;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
import org.apache.activemq.metric.MetricAggregator;
import org.apache.activemq.metric.Period;
import org.apache.activemq.transport.TransportFactory;
@@ -88,7 +87,7 @@
protected Broker sendBroker;
protected Broker rcvBroker;
protected ArrayList<Broker> brokers = new ArrayList<Broker>();
- protected AdvancedDispatchSPI dispatcher;
+ protected Dispatch dispatcher;
protected final AtomicLong msgIdGenerator = new AtomicLong();
protected final AtomicBoolean stopping = new AtomicBoolean();

@@ -135,8 +134,8 @@

protected abstract String getRemoteWireFormat();

- protected AdvancedDispatchSPI createDispatcher() {
- return new AdvancedDispatchSPI(asyncThreadPoolSize, Broker.MAX_PRIORITY);
+ protected Dispatch createDispatcher() {
+ return DispatchFactory.create("test", asyncThreadPoolSize);
}

@Test
@@ -539,7 +538,7 @@
connection.stop();
}
if (dispatcher != null) {
- dispatcher.shutdown();
+ dispatcher.release();
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java Sun Dec 6 14:32:37 2009
@@ -46,7 +46,7 @@
protected void messageReceived(final ISourceController<MessageDelivery> controller, final MessageDelivery elem) {
if( schedualWait ) {
if (thinkTime > 0) {
- getDispatcher().schedule(new Runnable(){
+ getDispatcher().getGlobalQueue().dispatchAfter(new Runnable(){
public void run() {
consumerRate.increment();
controller.elementDispatched(elem);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java Sun Dec 6 14:32:37 2009
@@ -59,7 +59,7 @@

setupProducer();

- dispatchQueue = getDispatcher().createQueue(name + "-client");
+ dispatchQueue = getDispatcher().createSerialQueue(name + "-client");
dispatchTask = new Runnable(){
public void run() {
dispatch();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java Sun Dec 6 14:32:37 2009
@@ -21,15 +21,13 @@

import junit.framework.TestCase;

-import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.broker.BrokerDatabase;
import org.apache.activemq.apollo.broker.BrokerQueueStore;
import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
import org.apache.activemq.queue.IQueue;

/**
@@ -39,7 +37,7 @@
public class SharedQueueTest extends TestCase {

- AdvancedDispatchSPI dispatcher;
+ Dispatch dispatcher;
BrokerDatabase database;
BrokerQueueStore queueStore;
private static final boolean USE_KAHA_DB = true;
@@ -48,8 +46,8 @@

protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();

- protected AdvancedDispatchSPI createDispatcher() {
- return new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), Broker.MAX_PRIORITY);
+ protected Dispatch createDispatcher() {
+ return DispatchFactory.create("test", Runtime.getRuntime().availableProcessors());
}

protected int consumerStartDelay = 0;
@@ -77,9 +75,8 @@
}

protected void stopServices() throws Exception {
- dispatcher.shutdown();
database.stop();
- dispatcher.shutdown();
+ dispatcher.release();
queues.clear();
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatch.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatch.java?rev=887686&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatch.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatch.java Sun Dec 6 14:32:37 2009
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch;
+
+import java.nio.channels.SelectableChannel;
+
+
+public interface Dispatch extends Retained {
+
+ public void start();
+ public void shutdown(Runnable onShutdown);
+
+ public DispatchQueue getGlobalQueue();
+ public DispatchQueue getGlobalQueue(DispatchPriority priority);
+
+ public DispatchQueue createSerialQueue(String label);
+
+ public DispatchQueue getMainQueue();
+ public void dispatchMain();
+
+ public DispatchQueue getCurrentQueue();
+
+ public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue);
+
+}
\ No newline at end of file

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchAware.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchAware.java?rev=887686&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchAware.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchAware.java Sun Dec 6 14:32:37 2009
@@ -0,0 +1,14 @@
+package org.apache.activemq.dispatch;
+
+
+/**
+ * Handy interface to signal classes which would like an DispatchSPI instance
+ * injected into them.
+ *
+ * @author chirino
+ */
+public interface DispatchAware {
+
+ public void setDispatcher(Dispatch dispatcher);
+
+}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchFactory.java?rev=887686&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchFactory.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchFactory.java Sun Dec 6 14:32:37 2009
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch;
+
+import org.apache.activemq.dispatch.internal.simple.SimpleDispatchSPI;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class DispatchFactory {
+
+ public static Dispatch create() {
+ return create("system", Runtime.getRuntime().availableProcessors());
+ }
+
+ public static Dispatch create(String name, int threads) {
+ return new SimpleDispatchSPI(name, threads);
+ }
+
+}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObserver.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObserver.java?rev=887686&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObserver.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObserver.java Sun Dec 6 14:32:37 2009
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch;
+
+import org.apache.activemq.dispatch.internal.simple.DispatcherThread;
+
+public interface DispatchObserver {
+
+ public void onThreadCreate(DispatcherThread thread);
+ public void onThreadDestroy(DispatcherThread thread);
+
+ public void onQueueCreate(DispatchQueue queue);
+ public void onQueueDestroy(DispatchQueue queue);
+
+ public void onSourceCreate(DispatchSource source);
+ public void onSourceDestroy(DispatchSource source);
+
+ public void onDispatchRequest(DispatchQueue target, Runnable request);
+
+}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java Sun Dec 6 14:32:37 2009
@@ -26,50 +26,34 @@
*/
public class DispatchSystem {

- public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();
- static public DispatchQueue getCurrentQueue() {
- return CURRENT_QUEUE.get();
- }
-
- private static DispatchSPI spi;
+ final private static Dispatch spi = create();

- public static DispatchSPI create() {
- return create("system", Runtime.getRuntime().availableProcessors());
+ private static Dispatch create() {
+ return new SimpleDispatchSPI("system", Runtime.getRuntime().availableProcessors());
}

- public static SimpleDispatchSPI create(String name, int threads) {
- return new SimpleDispatchSPI(name, threads);
- }
-
- synchronized public static DispatchSPI spi() {
- if(spi==null) {
- spi = create();
- }
- return spi;
- }
-
static DispatchQueue getMainQueue() {
- return spi().getMainQueue();
+ return spi.getMainQueue();
}

static public DispatchQueue getGlobalQueue() {
- return spi().getGlobalQueue();
+ return spi.getGlobalQueue();
}

static public DispatchQueue getGlobalQueue(DispatchPriority priority) {
- return spi().getGlobalQueue(priority);
+ return spi.getGlobalQueue(priority);
}

- static DispatchQueue createQueue(String label) {
- return spi().createQueue(label);
+ static DispatchQueue getSerialQueue(String label) {
+ return spi.createSerialQueue(label);
}

static void dispatchMain() {
- spi().dispatchMain();
+ spi.dispatchMain();
}

static DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue) {
- return spi().createSource(channel, interestOps, queue);
+ return spi.createSource(channel, interestOps, queue);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java Sun Dec 6 14:32:37 2009
@@ -22,7 +22,12 @@
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSystem;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
+
+import static org.apache.activemq.dispatch.DispatchFactory.*;
+
+import static org.apache.activemq.dispatch.DispatchFactory.*;

/**
*
@@ -84,8 +89,8 @@
}

public void run() {
- DispatchQueue original = DispatchSystem.CURRENT_QUEUE.get();
- DispatchSystem.CURRENT_QUEUE.set(this);
+ DispatchQueue original = CURRENT_QUEUE.get();
+ CURRENT_QUEUE.set(this);
try {
Runnable runnable;
long lsize = size.get();
@@ -104,7 +109,7 @@
}
}
} finally {
- DispatchSystem.CURRENT_QUEUE.set(original);
+ CURRENT_QUEUE.set(original);
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java Sun Dec 6 14:32:37 2009
@@ -24,19 +24,19 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;

-import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.DispatchSPI;
+import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchSource;
import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;

import static org.apache.activemq.dispatch.DispatchPriority.*;

-import static org.apache.activemq.dispatch.DispatchPriority.*;

+public class AdvancedDispatchSPI extends BaseRetained implements Dispatch {

-public class AdvancedDispatchSPI extends BaseRetained implements DispatchSPI {
+ public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();

final SerialDispatchQueue mainQueue = new SerialDispatchQueue("main");
final GlobalDispatchQueue globalQueues[];
@@ -210,7 +210,7 @@
return globalQueues[priority.ordinal()];
}

- public DispatchQueue createQueue(String label) {
+ public DispatchQueue createSerialQueue(String label) {
AdvancedSerialDispatchQueue rc = new AdvancedSerialDispatchQueue(label);
rc.setTargetQueue(getGlobalQueue());
return rc;
@@ -222,6 +222,10 @@

public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue) {
return null;
+ }
+
+ public DispatchQueue getCurrentQueue() {
+ return CURRENT_QUEUE.get();
}

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java Sun Dec 6 14:32:37 2009
@@ -25,12 +25,13 @@
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.DispatchSystem;
import org.apache.activemq.util.Mapper;
import org.apache.activemq.util.PriorityLinkedList;
import org.apache.activemq.util.TimerHeap;
import org.apache.activemq.util.list.LinkedNodeList;

+import static org.apache.activemq.dispatch.DispatchFactory.*;
+
public class DispatcherThread implements Runnable {

static public final ThreadLocal<DispatcherThread> CURRENT = new ThreadLocal<DispatcherThread>();
@@ -183,7 +184,7 @@
// If no local work available wait for foreign work:
while((pdc = priorityQueue.poll())!=null){
if( pdc.priority < dispatchQueues.length ) {
- DispatchSystem.CURRENT_QUEUE.set(dispatchQueues[pdc.priority]);
+ AdvancedDispatchSPI.CURRENT_QUEUE.set(dispatchQueues[pdc.priority]);
}

if (pdc.tracker != null) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java Sun Dec 6 14:32:37 2009
@@ -20,7 +20,6 @@
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.DispatchSystem;

/**
*
@@ -48,7 +47,7 @@
outer: while( true ) {
int counter=0;
for (SimpleQueue queue : threadQueues) {
- DispatchSystem.CURRENT_QUEUE.set(queue);
+ SimpleDispatchSPI.CURRENT_QUEUE.set(queue);
Runnable runnable;
while( (runnable = queue.poll())!=null ) {
dispatch(runnable);
@@ -62,7 +61,7 @@
}

for (SimpleQueue queue : spi.globalQueues) {
- DispatchSystem.CURRENT_QUEUE.set(threadQueues[queue.getPriority().ordinal()]);
+ SimpleDispatchSPI.CURRENT_QUEUE.set(threadQueues[queue.getPriority().ordinal()]);

Runnable runnable;
while( (runnable = queue.poll())!=null ) {
@@ -118,7 +117,7 @@
break;
}
if( counter==0 ) {
- DispatchSystem.CURRENT_QUEUE.set(queue);
+ SimpleDispatchSPI.CURRENT_QUEUE.set(queue);
}
dispatch(runnable);
counter++;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java Sun Dec 6 14:32:37 2009
@@ -24,7 +24,7 @@

import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchPriority;
-import org.apache.activemq.dispatch.DispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.dispatch.DispatchSource;
import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;
@@ -38,8 +38,10 @@
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-public class SimpleDispatchSPI extends BaseRetained implements DispatchSPI {
+public class SimpleDispatchSPI extends BaseRetained implements Dispatch {

+ public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();
+
final SerialDispatchQueue mainQueue = new SerialDispatchQueue("main");
final GlobalDispatchQueue globalQueues[];
final DispatcherThread dispatchers[];
@@ -72,7 +74,7 @@
return globalQueues[priority.ordinal()];
}

- public DispatchQueue createQueue(String label) {
+ public DispatchQueue createSerialQueue(String label) {
SerialDispatchQueue rc = new SerialDispatchQueue(label) {
@Override
public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
@@ -142,5 +144,9 @@
public String getLabel() {
return label;
}
+
+ public DispatchQueue getCurrentQueue() {
+ return CURRENT_QUEUE.get();
+ }

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Sun Dec 6 14:32:37 2009
@@ -13,7 +13,7 @@
import junit.framework.TestCase;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;

@@ -45,10 +45,10 @@

public void testActorInvocation() throws Exception
{
- DispatchSPI advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatch advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
advancedSystem.start();

- DispatchQueue queue = advancedSystem.createQueue("test");
+ DispatchQueue queue = advancedSystem.createSerialQueue("test");
ActorTestObject testObject = Actor.create(new ActorTestObject(), queue);

CountDownLatch latch = new CountDownLatch(1);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java Sun Dec 6 14:32:37 2009
@@ -33,27 +33,27 @@
public class DispatchSystemTest {

public static void main(String[] args) throws Exception {
- DispatchSPI advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatch advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
advancedSystem.start();
benchmark("advanced global queue", advancedSystem, advancedSystem.getGlobalQueue(DEFAULT));
- benchmark("advanced private serial queue", advancedSystem, advancedSystem.createQueue("test"));
+ benchmark("advanced private serial queue", advancedSystem, advancedSystem.createSerialQueue("test"));

RunnableCountDownLatch latch = new RunnableCountDownLatch(1);
advancedSystem.shutdown(latch);
latch.await();

- DispatchSPI simpleSystem = new SimpleDispatchSPI("test", Runtime.getRuntime().availableProcessors());
+ Dispatch simpleSystem = new SimpleDispatchSPI("test", Runtime.getRuntime().availableProcessors());
simpleSystem.start();

benchmark("simple global queue", simpleSystem, simpleSystem.getGlobalQueue(DEFAULT));
- benchmark("simple private serial queue", simpleSystem, simpleSystem.createQueue("test"));
+ benchmark("simple private serial queue", simpleSystem, simpleSystem.createSerialQueue("test"));

latch = new RunnableCountDownLatch(1);
simpleSystem.shutdown(latch);
latch.await();
}

- private static void benchmark(String name, DispatchSPI spi, DispatchQueue queue) throws InterruptedException {
+ private static void benchmark(String name, Dispatch spi, DispatchQueue queue) throws InterruptedException {
// warm the JIT up..
benchmarkWork(spi, queue, 100000);

@@ -68,13 +68,13 @@
System.out.println(format("name: %s, duration: %,.3f ms, rate: %,.2f executions/sec", name, durationMS, rate));
}

- private static void benchmarkWork(final DispatchSPI spi, final DispatchQueue queue, int iterations) throws InterruptedException {
+ private static void benchmarkWork(final Dispatch spi, final DispatchQueue queue, int iterations) throws InterruptedException {
final CountDownLatch counter = new CountDownLatch(iterations);
Runnable task = new Runnable(){
public void run() {
counter.countDown();
if( counter.getCount()>0 ) {
- DispatchSystem.getCurrentQueue().dispatchAsync(this);
+ spi.getCurrentQueue().dispatchAsync(this);
}
}
};

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java Sun Dec 6 14:32:37 2009
@@ -63,7 +63,7 @@

private Work(CountDownLatch counter, AdvancedDispatchSPI spi) {
this.counter = counter;
- dispatchQueue = spi.createQueue("test");
+ dispatchQueue = spi.createSerialQueue("test");
}

public void run() {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java Sun Dec 6 14:32:37 2009
@@ -22,9 +22,8 @@
import javax.xml.bind.annotation.XmlRootElement;

import org.apache.activemq.apollo.broker.Broker;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;

@XmlRootElement(name="dispatcher")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -37,12 +36,11 @@
@XmlAttribute(required=false)
int threads = Runtime.getRuntime().availableProcessors();

- public AdvancedDispatchSPI createDispatcher(BrokerXml brokerXml) {
+ public Dispatch createDispatcher(BrokerXml brokerXml) {
if( name == null ) {
-// VirtualHostXml vh = brokerXml.getDefaultVirtualHost();
- name = "Broker: ";
+ name = "broker";
}
- return new AdvancedDispatchSPI(threads, maxPriority);
+ return DispatchFactory.create(name, threads);
}

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java Sun Dec 6 14:32:37 2009
@@ -26,7 +26,7 @@
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.broker.store.memory.MemoryStore;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
@@ -44,7 +44,7 @@
LOG.info("Loading broker configuration from the classpath with URI: " + uri);
Broker broker = BrokerFactory.createBroker(uri);

- AdvancedDispatchSPI p = (AdvancedDispatchSPI)broker.getDispatcher();
+ Dispatch p = (Dispatch)broker.getDispatcher();
// assertEquals(4, p.getSize());
// assertEquals("test dispatcher", p.getName());

Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java Sun Dec 6 14:32:37 2009
@@ -75,6 +75,7 @@
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.FilterException;
import org.apache.activemq.filter.LogicExpression;
@@ -693,7 +694,7 @@
}
controller = new FlowController<MessageDelivery>(null, flow, limiter, this);
controller.useOverFlowQueue(false);
- controller.setExecutor(connection.getDispatcher().createPriorityExecutor(connection.getDispatcher().getDispatchPriorities() - 1));
+ controller.setExecutor(connection.getDispatcher().getGlobalQueue(DispatchPriority.HIGH));
super.onFlowOpened(controller);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java Sun Dec 6 14:32:37 2009
@@ -26,7 +26,6 @@

import junit.framework.TestCase;

-import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.broker.BrokerDatabase;
import org.apache.activemq.apollo.broker.BrokerQueueStore;
import org.apache.activemq.apollo.broker.MessageDelivery;
@@ -39,8 +38,10 @@
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.MessageId;
import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.DispatchFactory;
import org.apache.activemq.flow.AbstractLimitedFlowResource;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
@@ -64,7 +65,7 @@

private static int PERFORMANCE_SAMPLES = 5;

- AdvancedDispatchSPI dispatcher;
+ Dispatch dispatcher;
BrokerDatabase database;
BrokerQueueStore queueStore;
private static final boolean USE_KAHA_DB = true;
@@ -81,8 +82,8 @@
protected ArrayList<Producer> producers = new ArrayList<Producer>();
protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();

- protected AdvancedDispatchSPI createDispatcher() {
- return new AdvancedDispatchSPI(THREAD_POOL_SIZE, Broker.MAX_PRIORITY);
+ protected Dispatch createDispatcher() {
+ return DispatchFactory.create("pref-test", THREAD_POOL_SIZE);
}

protected int consumerStartDelay = 0;
@@ -104,9 +105,8 @@
}

protected void stopServices() throws Exception {
- dispatcher.shutdown();
database.stop();
- dispatcher.shutdown();
+ dispatcher.release();
consumers.clear();
producers.clear();
queues.clear();
@@ -216,7 +216,7 @@
};

if (consumerStartDelay > 0) {
- dispatcher.schedule(startConsumers, consumerStartDelay, TimeUnit.SECONDS);
+ dispatcher.getGlobalQueue().dispatchAfter(startConsumers, consumerStartDelay, TimeUnit.SECONDS);
} else {
startConsumers.run();
}
@@ -308,7 +308,7 @@
sendRate.name("Producer " + name + " Rate");
totalProducerRate.add(sendRate);

- dispatchQueue = dispatcher.createQueue(name);
+ dispatchQueue = dispatcher.createSerialQueue(name);
dispatchTask = new Runnable(){
public void run() {
dispatch();
@@ -332,7 +332,7 @@

Flow flow = new Flow(name, true);
outboundQueue = new SingleFlowRelay<OpenWireMessageDelivery>(flow, name, limiter);
- outboundQueue.setFlowExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ outboundQueue.setFlowExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));
outboundQueue.setDrain(new QueueDispatchTarget<OpenWireMessageDelivery>() {

public void drain(OpenWireMessageDelivery elem, ISourceController<OpenWireMessageDelivery> controller) {
@@ -449,7 +449,7 @@

controller = new FlowController<MessageDelivery>(null, flow, limiter, this);
controller.useOverFlowQueue(false);
- controller.setExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ controller.setExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));

rate.name("Consumer " + name + " Rate");
totalConsumerRate.add(rate);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java Sun Dec 6 14:32:37 2009
@@ -22,6 +22,7 @@
import org.apache.activemq.command.MessageDispatch;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
import org.apache.activemq.flow.IFlowResource;
@@ -70,7 +71,7 @@
return null;
}
}, flow, limiter, inboundMutex);
- inboundController.setExecutor(getDispatcher().createPriorityExecutor(getDispatcher().getDispatchPriorities() - 1));
+ inboundController.setExecutor(getDispatcher().getGlobalQueue(DispatchPriority.HIGH));

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/AbstractFlowQueue.java Sun Dec 6 14:32:37 2009
@@ -20,7 +20,8 @@
import java.util.Collection;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.DispatchPriority;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.flow.ISinkController.FlowControllable;

/**
@@ -31,7 +32,7 @@
*/
public abstract class AbstractFlowQueue<E> extends AbstractFlowRelay<E> implements FlowControllable<E>, IFlowQueue<E> {

- protected AdvancedDispatchSPI dispatcher;
+ protected Dispatch dispatcher;
protected Collection<IPollableFlowSource.FlowReadyListener<E>> readyListeners;
private boolean notifyReady = false;
protected int dispatchPriority = 0;
@@ -87,7 +88,7 @@
}

stop();
- dispatchQueue.setFinalizer(onShutdown);
+ dispatchQueue.setShutdownHandler(onShutdown);
dispatchQueue.release();
dispatchQueue = null;
}
@@ -131,10 +132,10 @@
* @param dispatcher
* The dispatcher to handle messages.
*/
- public synchronized void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public synchronized void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;

- dispatchQueue = dispatcher.createQueue(getResourceName());
+ dispatchQueue = dispatcher.createSerialQueue(getResourceName());
dispatchTask = new Runnable(){
public void run() {
if( pollingDispatch() ) {
@@ -146,7 +147,7 @@
// TODO:
// dispatchContext.updatePriority(dispatchPriority);

- super.setFlowExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ super.setFlowExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));
}

public synchronized void setDispatchPriority(int priority) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java Sun Dec 6 14:32:37 2009
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.queue;

+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
import org.apache.activemq.flow.IFlowResource;
@@ -170,7 +171,7 @@
}
};
controller.useOverFlowQueue(false);
- controller.setExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ controller.setExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));
}

cursor = queue.openCursor(getResourceName(), memoryController, true, true);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IFlowQueue.java Sun Dec 6 14:32:37 2009
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.queue;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.flow.IFlowRelay;

public interface IFlowQueue<E> extends IBlockingFlowSource<E>, IPollableFlowSource<E>, IFlowRelay<E> {
@@ -57,7 +57,7 @@
* @param dispatcher
* The dispatcher to be used by the queue.
*/
- public void setDispatcher(AdvancedDispatchSPI dispatcher);
+ public void setDispatcher(Dispatch dispatcher);

/**
* Sets the base dispatch priority for the queue. Setting to higher value

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/IQueue.java Sun Dec 6 14:32:37 2009
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.queue;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.queue.QueueStore.PersistentQueue;
import org.apache.activemq.util.Mapper;

@@ -47,7 +47,7 @@
* @param dispatcher
* The dispatcher to be used by the queue.
*/
- public void setDispatcher(AdvancedDispatchSPI dispatcher);
+ public void setDispatcher(Dispatch dispatcher);

/**
* Sets the base dispatch priority for the queue. Setting to higher value

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java Sun Dec 6 14:32:37 2009
@@ -21,7 +21,7 @@
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.util.Mapper;
import org.apache.activemq.util.buffer.AsciiBuffer;
@@ -31,7 +31,7 @@
protected HashSet<Subscription<V>> subscriptions = new HashSet<Subscription<V>>();
private HashMap<Integer, IQueue<K, V>> partitions = new HashMap<Integer, IQueue<K, V>>();
protected QueueStore<K, V> store;
- protected AdvancedDispatchSPI dispatcher;
+ protected Dispatch dispatcher;
protected boolean started;
protected boolean shutdown = false;
protected QueueDescriptor queueDescriptor;
@@ -253,7 +253,7 @@
this.autoRelease = autoRelease;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
checkShutdown();
this.dispatcher = dispatcher;
synchronized (this) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java Sun Dec 6 14:32:37 2009
@@ -18,6 +18,7 @@

import java.util.HashMap;

+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
import org.apache.activemq.flow.IFlowController;
@@ -273,7 +274,7 @@
}
};
controller.useOverFlowQueue(false);
- controller.setExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ controller.setExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));
}

return queue.openCursor(name, controller, pageInElements, skipAcquired);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java Sun Dec 6 14:32:37 2009
@@ -10,7 +10,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+import org.apache.activemq.dispatch.DispatchPriority;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.flow.AbstractLimiter;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.IFlowLimiter;
@@ -65,12 +66,12 @@
private final int inputWindowSize = 1000;
private final int inputResumeThreshold = 500;

- private AdvancedDispatchSPI dispatcher;
+ private Dispatch dispatcher;
private final AtomicBoolean stopping = new AtomicBoolean(false);
protected boolean blockingTransport = false;
ExecutorService blockingWriter;

- public static void setInShutdown(boolean val, AdvancedDispatchSPI dispatcher) {
+ public static void setInShutdown(boolean val, Dispatch dispatcher) {
if (val != inShutdown.getAndSet(val)) {
if (val) {
if (USE_RATE_BASED_LIMITER) {
@@ -104,7 +105,7 @@
dt.setName(name + "-transport");
}
dt.setDispatcher(getDispatcher());
- dt.setDispatchPriority(dispatcher.getDispatchPriorities() - 1);
+ dt.setDispatchPriority(DispatchPriority.HIGH);
}
transport.start();
}
@@ -153,7 +154,7 @@
queue.getFlowController(flow).useOverFlowQueue(false);
inputQueue = queue;
}
- inputQueue.setFlowExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ inputQueue.setFlowExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));
inputQueue.setDrain(new QueueDispatchTarget<Message>() {

public void drain(Message message, ISourceController<Message> controller) {
@@ -191,7 +192,7 @@
queue.addFlowReadyListener(asyncCommandQueue);
}
// Set the executor to be used by the queue's flow controllers:
- outputQueue.setFlowExecutor(dispatcher.createPriorityExecutor(dispatcher.getDispatchPriorities() - 1));
+ outputQueue.setFlowExecutor(dispatcher.getGlobalQueue(DispatchPriority.HIGH));

limiter.start();
outboundLimiter.start();
@@ -274,11 +275,11 @@
this.priorityLevels = priorityLevels;
}

- public AdvancedDispatchSPI getDispatcher() {
+ public Dispatch getDispatcher() {
return dispatcher;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;
}

@@ -455,12 +456,12 @@

protected static class RateBasedLimiterCollector implements Runnable {

- private AdvancedDispatchSPI dispatcher;
+ private Dispatch dispatcher;
private int samplingPeriod = 50;
private boolean scheduled = false;
private HashSet<RateBasedLimiter> limiters = new HashSet<RateBasedLimiter>();

- public synchronized void setDispatcher(AdvancedDispatchSPI d) {
+ public synchronized void setDispatcher(Dispatch d) {
if (d != dispatcher) {
scheduled = false;
dispatcher = d;
@@ -517,7 +518,7 @@
}
if (!scheduled && !limiters.isEmpty()) {
scheduled = true;
- dispatcher.schedule(this, samplingPeriod, TimeUnit.MILLISECONDS);
+ dispatcher.getGlobalQueue().dispatchAfter(this, samplingPeriod, TimeUnit.MILLISECONDS);
}
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java Sun Dec 6 14:32:37 2009
@@ -21,10 +21,9 @@
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicBoolean;

-import org.apache.activemq.dispatch.DispatcherAware;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
+import org.apache.activemq.dispatch.DispatchAware;
import org.apache.activemq.flow.IFlowSink;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.transport.Transport;
@@ -54,7 +53,7 @@
private TransportServer transportServer;
private String uri;
private String name;
- protected AdvancedDispatchSPI dispatcher;
+ protected Dispatch dispatcher;
private final AtomicBoolean stopping = new AtomicBoolean();
private boolean useInputQueues = false;

@@ -126,8 +125,8 @@

transportServer = TransportFactory.bind(new URI(uri));
transportServer.setAcceptListener(this);
- if (transportServer instanceof DispatcherAware) {
- ((DispatcherAware) transportServer).setDispatcher(dispatcher);
+ if (transportServer instanceof DispatchAware) {
+ ((DispatchAware) transportServer).setDispatcher(dispatcher);
}
transportServer.start();

@@ -160,7 +159,7 @@
error.printStackTrace();
}

- public AdvancedDispatchSPI getDispatcher() {
+ public Dispatch getDispatcher() {
return dispatcher;
}

@@ -168,7 +167,7 @@
this.name = name;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;
}

@@ -190,7 +189,7 @@

protected void createDispatcher() {
if (dispatcher == null) {
- dispatcher = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), Message.MAX_PRIORITY);
+ dispatcher = DispatchFactory.create("mock-broker", Runtime.getRuntime().availableProcessors());
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java Sun Dec 6 14:32:37 2009
@@ -20,9 +20,8 @@

import junit.framework.TestCase;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -64,7 +63,7 @@
protected MockBroker rcvBroker;
protected MockClient client;

- protected AdvancedDispatchSPI dispatcher;
+ protected Dispatch dispatcher;

static public final Mapper<Long, Message> KEY_MAPPER = new Mapper<Long, Message>() {
public Long map(Message element) {
@@ -95,8 +94,8 @@
}
}

- protected AdvancedDispatchSPI createDispatcher(String name) {
- return new AdvancedDispatchSPI(threadsPerDispatcher, Message.MAX_PRIORITY);
+ protected Dispatch createDispatcher(String name) {
+ return DispatchFactory.create("test", threadsPerDispatcher);
}

public void test_1_1_0() throws Exception {
@@ -285,7 +284,7 @@
}
}

- AdvancedDispatchSPI clientDispatcher = null;
+ Dispatch clientDispatcher = null;
if (SEPARATE_CLIENT_DISPATCHER) {
clientDispatcher = createDispatcher("ClientDispatcher");
clientDispatcher.start();
@@ -344,9 +343,8 @@
broker.stopServices();
}

- client.getDispatcher().shutdown();
if (dispatcher != null) {
- dispatcher.shutdown();
+ dispatcher.release();
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java Sun Dec 6 14:32:37 2009
@@ -7,9 +7,8 @@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicLong;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread;
+import org.apache.activemq.dispatch.Dispatch;
+import org.apache.activemq.dispatch.DispatchFactory;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -44,7 +43,7 @@
protected ArrayList<MetricCounter> additionalReportMetrics = new ArrayList<MetricCounter>();
protected boolean includeDetailedRates = false;

- protected AdvancedDispatchSPI dispatcher;
+ protected Dispatch dispatcher;

public RemoteConsumer consumer(int index) {
return consumers.get(index);
@@ -215,7 +214,7 @@
return testName;
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
+ public void setDispatcher(Dispatch dispatcher) {
this.dispatcher = dispatcher;
}

@@ -275,13 +274,13 @@
}
}

- public AdvancedDispatchSPI getDispatcher() {
+ public Dispatch getDispatcher() {
return dispatcher;
}

- protected AdvancedDispatchSPI createDispatcher() {
+ protected Dispatch createDispatcher() {
if (dispatcher == null) {
- dispatcher = new AdvancedDispatchSPI(threadsPerDispatcher, numPriorities);
+ dispatcher = DispatchFactory.create("client", threadsPerDispatcher);
}
return dispatcher;
}
@@ -311,7 +310,7 @@
}
finally
{
- test.getDispatcher().shutdown();
+ test.getDispatcher().release();
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java Sun Dec 6 14:32:37 2009
@@ -1,14 +1,11 @@
package org.apache.activemq.queue.perf;

-import java.net.URI;
import java.util.concurrent.TimeUnit;

import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.metric.MetricAggregator;
import org.apache.activemq.metric.MetricCounter;
-import org.apache.activemq.transport.DispatchableTransport;
-import org.apache.activemq.transport.TransportFactory;

public class RemoteConsumer extends ClientConnection {

@@ -32,7 +29,7 @@
protected void messageReceived(final ISourceController<Message> controller, final Message elem) {
if (schedualWait) {
if (thinkTime > 0) {
- getDispatcher().schedule(new Runnable() {
+ getDispatcher().getGlobalQueue().dispatchAfter(new Runnable() {

public void run() {
consumerRate.increment();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java Sun Dec 6 14:32:37 2009
@@ -48,7 +48,7 @@
super.start();
outboundController = outputQueue.getFlowController(outboundFlow);

- dispatchQueue = getDispatcher().createQueue(name + "-client");
+ dispatchQueue = getDispatcher().createSerialQueue(name + "-client");
dispatchTask = new Runnable(){
public void run() {
dispatch();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java Sun Dec 6 14:32:37 2009
@@ -9,6 +9,7 @@
import org.apache.activemq.apollo.stomp.StompFrame;
import org.apache.activemq.apollo.stomp.StompMessageDelivery;
import org.apache.activemq.broker.RemoteConsumer;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
import org.apache.activemq.flow.IFlowResource;
@@ -64,7 +65,7 @@
return null;
}
}, flow, limiter, inboundMutex);
- inboundController.setExecutor(getDispatcher().createPriorityExecutor(getDispatcher().getDispatchPriorities() - 1));
+ inboundController.setExecutor(getDispatcher().getGlobalQueue(DispatchPriority.HIGH));
}

public void onCommand(Object command) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DispatchableTransport.java Sun Dec 6 14:32:37 2009
@@ -16,11 +16,12 @@
*/
package org.apache.activemq.transport;

-import org.apache.activemq.dispatch.DispatcherAware;
+import org.apache.activemq.dispatch.DispatchPriority;
+import org.apache.activemq.dispatch.DispatchAware;

-public interface DispatchableTransport extends Transport, DispatcherAware {
+public interface DispatchableTransport extends Transport, DispatchAware {

- public void setDispatchPriority(int priority);
+ public void setDispatchPriority(DispatchPriority priority);

public void setName(String name);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java?rev=887686&r1=887685&r2=887686&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java Sun Dec 6 14:32:37 2009
@@ -13,9 +13,11 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

+import org.apache.activemq.dispatch.DispatchPriority;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.Dispatch;
import org.apache.activemq.dispatch.internal.RunnableCountDownLatch;
-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
import org.apache.activemq.transport.DispatchableTransport;
import org.apache.activemq.transport.FutureResponse;
import org.apache.activemq.transport.ResponseCallback;
@@ -69,7 +71,7 @@
pipe.write(EOF_TOKEN);
if (dispatchQueue != null) {
RunnableCountDownLatch done = new RunnableCountDownLatch(1);
- dispatchQueue.setFinalizer(done);
+ dispatchQueue.setShutdownHandler(done);
dispatchQueue.release();
done.await();
} else {
@@ -80,8 +82,8 @@
}
}

- public void setDispatcher(AdvancedDispatchSPI dispatcher) {
- dispatchQueue = dispatcher.createQueue(name);
+ public void setDispatcher(Dispatch dispatcher) {
+ dispatchQueue = dispatcher.createSerialQueue(name);
dispatchTask = new Runnable(){
public void run() {
dispatch();
@@ -227,7 +229,7 @@
this.wireFormat = wireFormat;
}

- public void setDispatchPriority(int priority) {
+ public void setDispatchPriority(DispatchPriority priority) {
// TODO:
// readContext.updatePriority(priority);
}

svn commit: r887630 - in /activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src: main/java/org/apache/activemq/dispatch/ main/java/org/apache/activemq/dispatch/internal/ main/java/org/apache/activemq/dispatch/internal/advanced/ main/java/org/a...

2009-12-05T18:52:47Z

Author: chirino
Date: Sun Dec 6 02:52:35 2009
New Revision: 887630

URL: http://svn.apache.org/viewvc?rev=887630&view=rev
Log:
simple package now implements dispatchAfter

Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchPriority.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatchObserver.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObject.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/AbstractDispatchObject.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObject.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObject.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObject.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchObject.java Sun Dec 6 02:52:35 2009
@@ -20,18 +20,14 @@
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-public interface DispatchObject {
+public interface DispatchObject extends Retained {

- public void retain();
- public void release();
-
public <Context> Context getContext();
public <Context> void setContext(Context context);

public void suspend();
public void resume();

- public void setFinalizer(Runnable finalizer);
public void setTargetQueue(DispatchQueue queue);
public DispatchQueue getTargetQueue();
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchPriority.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchPriority.java?rev=887630&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchPriority.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchPriority.java Sun Dec 6 02:52:35 2009
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch;
+
+public enum DispatchPriority {
+ HIGH,
+ DEFAULT,
+ LOW;
+}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchQueue.java Sun Dec 6 02:52:35 2009
@@ -16,16 +16,19 @@
*/
package org.apache.activemq.dispatch;

+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
/**
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-public interface DispatchQueue extends DispatchObject {
+public interface DispatchQueue extends DispatchObject, Executor {

public void dispatchAsync(Runnable runnable);
public void dispatchSync(Runnable runnable) throws InterruptedException;

- public void dispatchAfter(long delayMS, Runnable runnable);
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit);
public void dispatchApply(int iterations, Runnable runnable) throws InterruptedException;

String getLabel();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSPI.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSPI.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSPI.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSPI.java Sun Dec 6 02:52:35 2009
@@ -19,15 +19,16 @@

import java.nio.channels.SelectableChannel;

-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;

-public interface DispatchSPI {
+public interface DispatchSPI extends Retained {
public void start();
public void shutdown(Runnable onShutdown);

public DispatchQueue getMainQueue();
- public DispatchQueue getGlobalQueue(DispatchQueuePriority priority);
+ public DispatchQueue getGlobalQueue();
+ public DispatchQueue getGlobalQueue(DispatchPriority priority);
public DispatchQueue createQueue(String label);
public void dispatchMain();
public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue);
+
}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java Sun Dec 6 02:52:35 2009
@@ -26,26 +26,24 @@
*/
public class DispatchSystem {

- public static enum DispatchQueuePriority {
- HIGH,
- DEFAULT,
- LOW;
- }
-
public final static ThreadLocal<DispatchQueue> CURRENT_QUEUE = new ThreadLocal<DispatchQueue>();
static public DispatchQueue getCurrentQueue() {
return CURRENT_QUEUE.get();
}

private static DispatchSPI spi;
-
- private static DispatchSPI cretateDispatchSystemSPI() {
- return new SimpleDispatchSPI(Runtime.getRuntime().availableProcessors());
+
+ public static DispatchSPI create() {
+ return create("system", Runtime.getRuntime().availableProcessors());
+ }
+
+ public static SimpleDispatchSPI create(String name, int threads) {
+ return new SimpleDispatchSPI(name, threads);
}

synchronized public static DispatchSPI spi() {
if(spi==null) {
- spi = cretateDispatchSystemSPI();
+ spi = create();
}
return spi;
}
@@ -54,7 +52,11 @@
return spi().getMainQueue();
}

- static public DispatchQueue getGlobalQueue(DispatchQueuePriority priority) {
+ static public DispatchQueue getGlobalQueue() {
+ return spi().getGlobalQueue();
+ }
+
+ static public DispatchQueue getGlobalQueue(DispatchPriority priority) {
return spi().getGlobalQueue(priority);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherAware.java Sun Dec 6 02:52:35 2009
@@ -1,15 +1,14 @@
package org.apache.activemq.dispatch;

-import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;

/**
- * Handy interface to signal classes which would like an IDispatcher instance
+ * Handy interface to signal classes which would like an DispatchSPI instance
* injected into them.
*
* @author chirino
*/
public interface DispatcherAware {

- public void setDispatcher(AdvancedDispatchSPI dispatcher);
+ public void setDispatcher(DispatchSPI dispatcher);

}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java?rev=887630&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Retained.java Sun Dec 6 02:52:35 2009
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public interface Retained {
+
+ public void retain();
+ public void release();
+ public void setShutdownHandler(Runnable shutdownHandler);
+
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/AbstractDispatchObject.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/AbstractDispatchObject.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/AbstractDispatchObject.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/AbstractDispatchObject.java Sun Dec 6 02:52:35 2009
@@ -16,8 +16,6 @@
*/
package org.apache.activemq.dispatch.internal;

-import java.util.concurrent.atomic.AtomicReference;
-
import org.apache.activemq.dispatch.DispatchObject;
import org.apache.activemq.dispatch.DispatchQueue;

@@ -25,11 +23,10 @@
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-abstract public class AbstractDispatchObject implements DispatchObject {
+abstract public class AbstractDispatchObject extends BaseRetained implements DispatchObject {

protected volatile Object context;
protected volatile DispatchQueue targetQueue;
- protected AtomicReference<Runnable> finalizer = new AtomicReference<Runnable>();

@SuppressWarnings("unchecked")
public <Context> Context getContext() {
@@ -40,10 +37,6 @@
this.context = context;
}

- public void setFinalizer(Runnable finalizer) {
- this.finalizer.set(finalizer);
- }
-
public void setTargetQueue(DispatchQueue targetQueue) {
this.targetQueue = targetQueue;
}
@@ -51,4 +44,6 @@
public DispatchQueue getTargetQueue() {
return this.targetQueue;
}
+
+
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java?rev=887630&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/BaseRetained.java Sun Dec 6 02:52:35 2009
@@ -0,0 +1,29 @@
+package org.apache.activemq.dispatch.internal;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class BaseRetained {
+
+ final protected AtomicInteger reatinCounter = new AtomicInteger(1);
+ final protected AtomicReference<Runnable> shutdownHandler = new AtomicReference<Runnable>();
+
+ public void setShutdownHandler(Runnable finalizer) {
+ this.shutdownHandler.set(finalizer);
+ }
+
+ public void retain() {
+ int prev = reatinCounter.getAndIncrement();
+ assert prev!=0;
+ }
+
+ public void release() {
+ if( reatinCounter.decrementAndGet()==0 ) {
+ Runnable value = shutdownHandler.getAndSet(null);
+ if( value!=null ) {
+ value.run();
+ }
+ }
+ }
+
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java Sun Dec 6 02:52:35 2009
@@ -17,6 +17,7 @@
package org.apache.activemq.dispatch.internal;

import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;

@@ -31,7 +32,6 @@

private final ConcurrentLinkedQueue<Runnable> runnables = new ConcurrentLinkedQueue<Runnable>();
final private String label;
- final private AtomicInteger reatinCounter = new AtomicInteger(1);
final private AtomicInteger suspendCounter = new AtomicInteger();
final private AtomicLong size = new AtomicLong();

@@ -57,10 +57,14 @@
suspendCounter.incrementAndGet();
}

- public void dispatchAfter(long delayMS, Runnable runnable) {
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
throw new RuntimeException("TODO: implement me.");
}

+ public void execute(Runnable command) {
+ dispatchAsync(command);
+ }
+
public void dispatchAsync(Runnable runnable) {
if( runnable == null ) {
throw new IllegalArgumentException();
@@ -112,18 +116,4 @@
QueueSupport.dispatchApply(this, iterations, runnable);
}

- public void retain() {
- int prev = reatinCounter.getAndIncrement();
- assert prev!=0;
- }
-
- public void release() {
- if( reatinCounter.decrementAndGet()==0 ) {
- Runnable value = finalizer.getAndSet(null);
- if( value!=null ) {
- value.run();
- }
- }
- }
-
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java Sun Dec 6 02:52:35 2009
@@ -25,14 +25,18 @@
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchSPI;
import org.apache.activemq.dispatch.DispatchSource;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;

-import static org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority.*;
+import static org.apache.activemq.dispatch.DispatchPriority.*;

-public class AdvancedDispatchSPI implements DispatchSPI {
+import static org.apache.activemq.dispatch.DispatchPriority.*;
+
+
+public class AdvancedDispatchSPI extends BaseRetained implements DispatchSPI {

final SerialDispatchQueue mainQueue = new SerialDispatchQueue("main");
final GlobalDispatchQueue globalQueues[];
@@ -56,7 +60,7 @@

globalQueues = new GlobalDispatchQueue[3];
for (int i = 0; i < 3; i++) {
- globalQueues[i] = new GlobalDispatchQueue(this, DispatchQueuePriority.values()[i]);
+ globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i]);
}

loadBalancer = new SimpleLoadBalancer();
@@ -198,13 +202,17 @@
return mainQueue;
}

- public DispatchQueue getGlobalQueue(DispatchQueuePriority priority) {
+ public DispatchQueue getGlobalQueue() {
+ return getGlobalQueue(DEFAULT);
+ }
+
+ public DispatchQueue getGlobalQueue(DispatchPriority priority) {
return globalQueues[priority.ordinal()];
}

public DispatchQueue createQueue(String label) {
AdvancedSerialDispatchQueue rc = new AdvancedSerialDispatchQueue(label);
- rc.setTargetQueue(getGlobalQueue(DEFAULT));
+ rc.setTargetQueue(getGlobalQueue());
return rc;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java Sun Dec 6 02:52:35 2009
@@ -24,8 +24,8 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchSystem;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
import org.apache.activemq.util.Mapper;
import org.apache.activemq.util.PriorityLinkedList;
import org.apache.activemq.util.TimerHeap;
@@ -79,7 +79,7 @@

this.dispatchQueues = new ThreadDispatchQueue[3];
for (int i = 0; i < 3; i++) {
- dispatchQueues[i] = new ThreadDispatchQueue(this, DispatchQueuePriority.values()[i]);
+ dispatchQueues[i] = new ThreadDispatchQueue(this, DispatchPriority.values()[i]);
}

MAX_USER_PRIORITY = priorities - 1;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/GlobalDispatchQueue.java Sun Dec 6 02:52:35 2009
@@ -19,7 +19,7 @@
import java.util.concurrent.TimeUnit;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.internal.QueueSupport;

/**
@@ -30,9 +30,9 @@

private final String label;
private final AdvancedDispatchSPI spi;
- private final DispatchQueuePriority priority;
+ private final DispatchPriority priority;

- public GlobalDispatchQueue(AdvancedDispatchSPI spi, DispatchQueuePriority priority) {
+ public GlobalDispatchQueue(AdvancedDispatchSPI spi, DispatchPriority priority) {
this.spi = spi;
this.priority = priority;
this.label=priority.toString();
@@ -42,12 +42,16 @@
return label;
}

+ public void execute(Runnable runnable) {
+ dispatchAsync(runnable);
+ }
+
public void dispatchAsync(Runnable runnable) {
spi.execute(runnable, priority.ordinal());
}

- public void dispatchAfter(long delayMS, Runnable runnable) {
- spi.schedule(runnable, priority.ordinal(), delayMS, TimeUnit.MILLISECONDS);
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
+ spi.schedule(runnable, priority.ordinal(), delay, TimeUnit.MILLISECONDS);
}

public void dispatchSync(final Runnable runnable) throws InterruptedException {
@@ -74,7 +78,7 @@
throw new UnsupportedOperationException();
}

- public void setFinalizer(Runnable finalizer) {
+ public void setShutdownHandler(Runnable finalizer) {
throw new UnsupportedOperationException();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ThreadDispatchQueue.java Sun Dec 6 02:52:35 2009
@@ -19,7 +19,7 @@
import java.util.concurrent.TimeUnit;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.internal.QueueSupport;

/**
@@ -30,9 +30,9 @@

private final String label;
private final DispatcherThread dispatcher;
- private final DispatchQueuePriority priority;
+ private final DispatchPriority priority;

- public ThreadDispatchQueue(DispatcherThread dispatcher, DispatchQueuePriority priority) {
+ public ThreadDispatchQueue(DispatcherThread dispatcher, DispatchPriority priority) {
this.priority = priority;
this.label=priority.toString()+" "+dispatcher.getName();
this.dispatcher = dispatcher;
@@ -42,12 +42,16 @@
return label;
}

+ public void execute(Runnable runnable) {
+ dispatchAsync(runnable);
+ }
+
public void dispatchAsync(Runnable runnable) {
dispatcher.execute(runnable, priority.ordinal());
}

- public void dispatchAfter(long delayMS, Runnable runnable) {
- dispatcher.schedule(runnable, priority.ordinal(), delayMS, TimeUnit.MILLISECONDS);
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
+ dispatcher.schedule(runnable, priority.ordinal(), delay, TimeUnit.MILLISECONDS);
}

public void dispatchSync(final Runnable runnable) throws InterruptedException {
@@ -74,7 +78,7 @@
throw new UnsupportedOperationException();
}

- public void setFinalizer(Runnable finalizer) {
+ public void setShutdownHandler(Runnable finalizer) {
throw new UnsupportedOperationException();
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatchObserver.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatchObserver.java?rev=887630&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatchObserver.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatchObserver.java Sun Dec 6 02:52:35 2009
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch.internal.simple;
+
+import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatchSource;
+
+public interface DispatchObserver {
+
+ public void onThreadCreate(DispatcherThread thread);
+ public void onThreadDestroy(DispatcherThread thread);
+
+ public void onQueueCreate(DispatchQueue queue);
+ public void onQueueDestroy(DispatchQueue queue);
+
+ public void onSourceCreate(DispatchSource source);
+ public void onSourceDestroy(DispatchSource source);
+
+ public void onDispatchRequest(DispatchQueue target, Runnable request);
+
+}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/DispatcherThread.java Sun Dec 6 02:52:35 2009
@@ -19,8 +19,8 @@

import java.util.concurrent.atomic.AtomicLong;

+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchSystem;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;

/**
*
@@ -36,9 +36,9 @@
this.spi = spi;
this.threadQueues = new ThreadDispatchQueue[3];
for (int i = 0; i < 3; i++) {
- threadQueues[i] = new ThreadDispatchQueue(this, DispatchQueuePriority.values()[i] );
+ threadQueues[i] = new ThreadDispatchQueue(this, DispatchPriority.values()[i] );
}
- setName("dispatcher:"+(ordinal+1));
+ setName(spi.getLabel()+" dispatcher: "+(ordinal+1));
setDaemon(true);
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/GlobalDispatchQueue.java Sun Dec 6 02:52:35 2009
@@ -17,10 +17,11 @@
package org.apache.activemq.dispatch.internal.simple;

import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.internal.QueueSupport;

/**
@@ -29,31 +30,35 @@
*/
public class GlobalDispatchQueue implements SimpleQueue {

- private final SimpleDispatchSPI system;
+ private final SimpleDispatchSPI spi;
final String label;
final ConcurrentLinkedQueue<Runnable> runnables = new ConcurrentLinkedQueue<Runnable>();
final AtomicLong counter;
- private final DispatchQueuePriority priority;
+ private final DispatchPriority priority;

- public GlobalDispatchQueue(SimpleDispatchSPI system, DispatchQueuePriority priority) {
- this.system = system;
+ public GlobalDispatchQueue(SimpleDispatchSPI spi, DispatchPriority priority) {
+ this.spi = spi;
this.priority = priority;
this.label=priority.toString();
- this.counter = system.globalQueuedRunnables;
+ this.counter = spi.globalQueuedRunnables;
}

public String getLabel() {
return label;
}

+ public void execute(Runnable runnable) {
+ dispatchAsync(runnable);
+ }
+
public void dispatchAsync(Runnable runnable) {
this.counter.incrementAndGet();
runnables.add(runnable);
- system.wakeup();
+ spi.wakeup();
}

- public void dispatchAfter(long delayMS, Runnable runnable) {
- throw new RuntimeException("TODO: implement me.");
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
+ spi.timerThread.addRelative(runnable, this, delay, unit);
}

public void dispatchSync(final Runnable runnable) throws InterruptedException {
@@ -80,7 +85,7 @@
throw new UnsupportedOperationException();
}

- public void setFinalizer(Runnable finalizer) {
+ public void setShutdownHandler(Runnable finalizer) {
throw new UnsupportedOperationException();
}

@@ -100,7 +105,7 @@
return rc;
}

- public DispatchQueuePriority getPriority() {
+ public DispatchPriority getPriority() {
return priority;
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatchSPI.java Sun Dec 6 02:52:35 2009
@@ -18,16 +18,19 @@

import java.nio.channels.SelectableChannel;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchSPI;
import org.apache.activemq.dispatch.DispatchSource;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;

-import static org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority.*;
+import static org.apache.activemq.dispatch.DispatchPriority.*;
+

/**
@@ -35,7 +38,7 @@
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-public class SimpleDispatchSPI implements DispatchSPI {
+public class SimpleDispatchSPI extends BaseRetained implements DispatchSPI {

final SerialDispatchQueue mainQueue = new SerialDispatchQueue("main");
final GlobalDispatchQueue globalQueues[];
@@ -45,26 +48,38 @@
final ConcurrentLinkedQueue<DispatcherThread> waitingDispatchers = new ConcurrentLinkedQueue<DispatcherThread>();
final AtomicInteger waitingDispatcherCount = new AtomicInteger();
final AtomicInteger startCounter = new AtomicInteger();
+ private final String label;
+ TimerThread timerThread;

- public SimpleDispatchSPI(int size) {
+ public SimpleDispatchSPI(String label, int size) {
+ this.label = label;
globalQueues = new GlobalDispatchQueue[3];
for (int i = 0; i < 3; i++) {
- globalQueues[i] = new GlobalDispatchQueue(this, DispatchQueuePriority.values()[i] );
+ globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i] );
}
dispatchers = new DispatcherThread[size];
}
-
+
public DispatchQueue getMainQueue() {
return mainQueue;
}

- public DispatchQueue getGlobalQueue(DispatchQueuePriority priority) {
+ public DispatchQueue getGlobalQueue() {
+ return getGlobalQueue(DEFAULT);
+ }
+
+ public DispatchQueue getGlobalQueue(DispatchPriority priority) {
return globalQueues[priority.ordinal()];
}

public DispatchQueue createQueue(String label) {
- SerialDispatchQueue rc = new SerialDispatchQueue(label);
- rc.setTargetQueue(getGlobalQueue(DEFAULT));
+ SerialDispatchQueue rc = new SerialDispatchQueue(label) {
+ @Override
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
+ timerThread.addRelative(runnable, this, delay, unit);
+ }
+ };
+ rc.setTargetQueue(getGlobalQueue());
return rc;
}

@@ -98,26 +113,34 @@
dispatchers[i] = new DispatcherThread(this, i);
dispatchers[i].start();
}
+ timerThread = new TimerThread(this);
+ timerThread.start();
}
}

public void shutdown(final Runnable onShutdown) {
if( startCounter.decrementAndGet()==0 ) {

- final AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.length);
+ final AtomicInteger shutdownCountDown = new AtomicInteger(dispatchers.length+1);
+ Runnable wrapper = new Runnable() {
+ public void run() {
+ if( shutdownCountDown.decrementAndGet()==0 && onShutdown!=null) {
+ onShutdown.run();
+ }
+ throw new DispatcherThread.Shutdown();
+ }
+ };
+
+ timerThread.shutdown(wrapper);
for (int i = 0; i < dispatchers.length; i++) {
ThreadDispatchQueue queue = dispatchers[i].threadQueues[LOW.ordinal()];
- queue.runnables.add(new Runnable() {
- public void run() {
- if( shutdownCountDown.decrementAndGet()==0 && onShutdown!=null) {
- onShutdown.run();
- }
- throw new DispatcherThread.Shutdown();
- }
- });
+ queue.runnables.add(wrapper);
}
}
}

+ public String getLabel() {
+ return label;
+ }

}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleQueue.java Sun Dec 6 02:52:35 2009
@@ -1,10 +1,10 @@
package org.apache.activemq.dispatch.internal.simple;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.DispatchPriority;

public interface SimpleQueue extends DispatchQueue {

Runnable poll();
- DispatchQueuePriority getPriority();
+ DispatchPriority getPriority();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/ThreadDispatchQueue.java Sun Dec 6 02:52:35 2009
@@ -18,10 +18,11 @@

import java.util.LinkedList;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority;
+import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.internal.QueueSupport;

/**
@@ -35,9 +36,9 @@
final ConcurrentLinkedQueue<Runnable> runnables = new ConcurrentLinkedQueue<Runnable>();
private DispatcherThread dispatcher;
final AtomicLong counter;
- private final DispatchQueuePriority priority;
+ private final DispatchPriority priority;

- public ThreadDispatchQueue(DispatcherThread dispatcher, DispatchQueuePriority priority) {
+ public ThreadDispatchQueue(DispatcherThread dispatcher, DispatchPriority priority) {
this.dispatcher = dispatcher;
this.priority = priority;
this.label=priority.toString();
@@ -48,6 +49,10 @@
return label;
}

+ public void execute(Runnable runnable) {
+ dispatchAsync(runnable);
+ }
+
public void dispatchAsync(Runnable runnable) {
// We don't have to take the synchronization hit
// if the current thread is the dispatcher since we know it's not
@@ -79,7 +84,7 @@
return rc;
}

- public void dispatchAfter(long delayMS, Runnable runnable) {
+ public void dispatchAfter(Runnable runnable, long delay, TimeUnit unit) {
throw new RuntimeException("TODO: implement me.");
}

@@ -107,7 +112,7 @@
throw new UnsupportedOperationException();
}

- public void setFinalizer(Runnable finalizer) {
+ public void setShutdownHandler(Runnable finalizer) {
throw new UnsupportedOperationException();
}

@@ -118,8 +123,7 @@
throw new UnsupportedOperationException();
}

-
- public DispatchQueuePriority getPriority() {
+ public DispatchPriority getPriority() {
return priority;
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java?rev=887630&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/TimerThread.java Sun Dec 6 02:52:35 2009
@@ -0,0 +1,138 @@
+package org.apache.activemq.dispatch.internal.simple;
+
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.util.TimerHeap;
+
+import static org.apache.activemq.dispatch.internal.simple.TimerThread.Type.*;
+
+public class TimerThread extends Thread {
+ enum Type {
+ RELATIVE,
+ ABSOLUTE,
+ SHUTDOWN
+ }
+ final private static class TimerRequest {
+ Type type;
+ long time;
+ TimeUnit unit;
+ Runnable runnable;
+ DispatchQueue target;
+ }
+
+ private final Object mutex = new Object();
+ private ArrayList<TimerRequest> requests = new ArrayList<TimerRequest>();
+
+ public TimerThread(SimpleDispatchSPI spi) {
+ setName(spi.getLabel()+" timer");
+ setDaemon(true);
+ }
+
+ public final void addAbsolute(Runnable runnable, DispatchQueue target, long time, TimeUnit unit) {
+ TimerRequest request = new TimerRequest();
+ request.type = ABSOLUTE;
+ request.time = time;
+ request.unit = unit;
+ request.runnable = runnable;
+ request.target = target;
+ add(request);
+ }
+
+ public final void addRelative(Runnable runnable, DispatchQueue target, long delay, TimeUnit unit) {
+ TimerRequest request = new TimerRequest();
+ request.type = RELATIVE;
+ request.time = delay;
+ request.unit = unit;
+ request.runnable = runnable;
+ request.target = target;
+ add(request);
+ }
+
+ public final void shutdown(Runnable onShutdown) {
+ TimerRequest request = new TimerRequest();
+ request.type = SHUTDOWN;
+ request.runnable = onShutdown;
+ add(request);
+ }
+
+ private void add(TimerRequest request) {
+ synchronized(mutex) {
+ requests.add(request);
+ mutex.notify();
+ }
+ }
+
+ public void run() {
+
+ final TimerHeap<TimerRequest> timerHeap = new TimerHeap<TimerRequest>() {
+ @Override
+ protected final void execute(TimerRequest request) {
+ request.target.dispatchAsync(request.runnable);
+ }
+ };
+
+ ArrayList<TimerRequest> swaped = new ArrayList<TimerRequest>();
+
+ try {
+ for(;;) {
+
+ synchronized(mutex) {
+ // Swap the arrays.
+ ArrayList<TimerRequest> t = requests;
+ requests = swaped;
+ swaped = t;
+ }
+
+ if( !swaped.isEmpty() ) {
+ for (TimerRequest request : swaped) {
+ switch( request.type ) {
+ case RELATIVE:
+ timerHeap.addRelative(request, request.time, request.unit);
+ break;
+ case ABSOLUTE:
+ timerHeap.addAbsolute(request, request.time, request.unit);
+ break;
+ case SHUTDOWN:
+ if( request.runnable!=null ) {
+ request.runnable.run();
+ }
+ return;
+ }
+ }
+ swaped.clear();
+ }
+
+ timerHeap.executeReadyTimers();
+
+ long start = System.nanoTime();
+ long next = timerHeap.timeToNext(TimeUnit.NANOSECONDS);
+
+ if( next==0 ) {
+ continue;
+ }
+
+ // if it's coming up soon.. just spin..
+ if( next>0 && next < 1000 ) {
+ while( System.nanoTime()-start < next ) {
+ }
+ continue;
+ }
+
+ long waitms = next / 1000000;
+ int waitns = (int) (next % 1000000);
+ synchronized(mutex) {
+ if( requests.isEmpty() ) {
+ if(next==-1) {
+ mutex.wait();
+ } else {
+ mutex.wait(waitms, waitns);
+ }
+ }
+ }
+ }
+ } catch (InterruptedException e) {
+ }
+ }
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java?rev=887630&r1=887629&r2=887630&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java Sun Dec 6 02:52:35 2009
@@ -22,8 +22,9 @@
import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
import org.apache.activemq.dispatch.internal.simple.SimpleDispatchSPI;

+import static org.apache.activemq.dispatch.DispatchPriority.*;
+
import static java.lang.String.*;
-import static org.apache.activemq.dispatch.DispatchSystem.DispatchQueuePriority.*;

/**
*
@@ -41,7 +42,7 @@
advancedSystem.shutdown(latch);
latch.await();

- DispatchSPI simpleSystem = new SimpleDispatchSPI(Runtime.getRuntime().availableProcessors());
+ DispatchSPI simpleSystem = new SimpleDispatchSPI("test", Runtime.getRuntime().availableProcessors());
simpleSystem.start();

benchmark("simple global queue", simpleSystem, simpleSystem.getGlobalQueue(DEFAULT));

svn commit: r887588 - in /activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src: examples/consumers/SimpleAsyncConsumer.cpp examples/main.cpp examples/producers/SimpleProducer.cpp main/activemq/core/ActiveMQSession.cpp

2009-12-05T12:52:27Z

Author: tabish
Date: Sat Dec 5 20:52:26 2009
New Revision: 887588

URL: http://svn.apache.org/viewvc?rev=887588&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-271

Change the example code so that the shutdown is performed properly.

Modified:
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/main.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/producers/SimpleProducer.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp?rev=887588&r1=887587&r2=887588&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp Sat Dec 5 20:52:26 2009
@@ -77,7 +77,11 @@
}

virtual ~SimpleAsyncConsumer(){
- cleanup();
+ this->cleanup();
+ }
+
+ void close() {
+ this->cleanup();
}

void runConsumer() {
@@ -156,7 +160,7 @@
// registered as an ExceptionListener with the connection.
virtual void onException( const CMSException& ex AMQCPP_UNUSED ) {
printf("CMS Exception occurred. Shutting down client.\n");
- exit(1);
+ //exit(1);
}

virtual void transportInterrupted() {
@@ -179,29 +183,29 @@
// Destroy resources.
try{
if( destination != NULL ) delete destination;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
destination = NULL;

try{
if( consumer != NULL ) delete consumer;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
consumer = NULL;

// Close open resources.
try{
if( session != NULL ) session->close();
if( connection != NULL ) connection->close();
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}

// Now Destroy them
try{
if( session != NULL ) delete session;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
session = NULL;

try{
if( connection != NULL ) delete connection;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
connection = NULL;
}
};
@@ -270,6 +274,9 @@
std::cout << "Press 'q' to quit" << std::endl;
while( std::cin.get() != 'q') {}

+ // All CMS resources should be closed before the library is shutdown.
+ consumer.close();
+
std::cout << "-----------------------------------------------------\n";
std::cout << "Finished with the example." << std::endl;
std::cout << "=====================================================\n";

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/main.cpp?rev=887588&r1=887587&r2=887588&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/main.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/main.cpp Sat Dec 5 20:52:26 2009
@@ -76,6 +76,10 @@
cleanup();
}

+ void close() {
+ this->cleanup();
+ }
+
virtual void run() {

try {
@@ -199,6 +203,10 @@
cleanup();
}

+ void close() {
+ this->cleanup();
+ }
+
void waitUntilReady() {
latch.await();
}
@@ -400,6 +408,9 @@
long long endTime = System::currentTimeMillis();
double totalTime = (endTime - startTime) / 1000.0;

+ consumer.close();
+ producer.close();
+
std::cout << "Time to completion = " << totalTime << " seconds." << std::endl;
std::cout << "-----------------------------------------------------\n";
std::cout << "Finished with the example." << std::endl;

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/producers/SimpleProducer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/producers/SimpleProducer.cpp?rev=887588&r1=887587&r2=887588&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/producers/SimpleProducer.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/examples/producers/SimpleProducer.cpp Sat Dec 5 20:52:26 2009
@@ -81,6 +81,10 @@
cleanup();
}

+ void close() {
+ this->cleanup();
+ }
+
virtual void run() {
try {
// Create a ConnectionFactory
@@ -226,6 +230,7 @@
// Create the producer and run it.
SimpleProducer producer( brokerURI, numMessages, destURI, useTopics );
producer.run();
+ producer.close();

std::cout << "-----------------------------------------------------\n";
std::cout << "Finished with the example." << std::endl;

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=887588&r1=887587&r2=887588&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Sat Dec 5 20:52:26 2009
@@ -118,6 +118,9 @@

try {

+ // Now indicate that this session is closed.
+ closed = true;
+
// Stop the dispatch executor.
stop();

@@ -163,9 +166,6 @@
info->setObjectId( this->sessionInfo->getSessionId() );
info->setLastDeliveredSequenceId( this->lastDeliveredSequenceId );
this->connection->oneway( info );
-
- // Now indicate that this session is closed.
- closed = true;
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

svn commit: r887584 - in /activemq/activemq-cpp/trunk/activemq-cpp/src: examples/consumers/SimpleAsyncConsumer.cpp examples/main.cpp examples/producers/SimpleProducer.cpp main/activemq/core/ActiveMQSession.cpp

2009-12-05T12:20:37Z

Author: tabish
Date: Sat Dec 5 20:20:36 2009
New Revision: 887584

URL: http://svn.apache.org/viewvc?rev=887584&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-271

Change the example code so that the shutdown is performed properly.

Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/examples/producers/SimpleProducer.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp?rev=887584&r1=887583&r2=887584&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp Sat Dec 5 20:20:36 2009
@@ -77,7 +77,11 @@
}

virtual ~SimpleAsyncConsumer(){
- cleanup();
+ this->cleanup();
+ }
+
+ void close() {
+ this->cleanup();
}

void runConsumer() {
@@ -156,7 +160,7 @@
// registered as an ExceptionListener with the connection.
virtual void onException( const CMSException& ex AMQCPP_UNUSED ) {
printf("CMS Exception occurred. Shutting down client.\n");
- exit(1);
+ //exit(1);
}

virtual void transportInterrupted() {
@@ -179,29 +183,29 @@
// Destroy resources.
try{
if( destination != NULL ) delete destination;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
destination = NULL;

try{
if( consumer != NULL ) delete consumer;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
consumer = NULL;

// Close open resources.
try{
if( session != NULL ) session->close();
if( connection != NULL ) connection->close();
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}

// Now Destroy them
try{
if( session != NULL ) delete session;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
session = NULL;

try{
if( connection != NULL ) delete connection;
- }catch (CMSException& e) { e.printStackTrace(); }
+ }catch (CMSException& e) {}
connection = NULL;
}
};
@@ -270,6 +274,9 @@
std::cout << "Press 'q' to quit" << std::endl;
while( std::cin.get() != 'q') {}

+ // All CMS resources should be closed before the library is shutdown.
+ consumer.close();
+
std::cout << "-----------------------------------------------------\n";
std::cout << "Finished with the example." << std::endl;
std::cout << "=====================================================\n";

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp?rev=887584&r1=887583&r2=887584&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp Sat Dec 5 20:20:36 2009
@@ -76,6 +76,10 @@
cleanup();
}

+ void close() {
+ this->cleanup();
+ }
+
virtual void run() {

try {
@@ -199,6 +203,10 @@
cleanup();
}

+ void close() {
+ this->cleanup();
+ }
+
void waitUntilReady() {
latch.await();
}
@@ -400,6 +408,9 @@
long long endTime = System::currentTimeMillis();
double totalTime = (endTime - startTime) / 1000.0;

+ consumer.close();
+ producer.close();
+
std::cout << "Time to completion = " << totalTime << " seconds." << std::endl;
std::cout << "-----------------------------------------------------\n";
std::cout << "Finished with the example." << std::endl;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/producers/SimpleProducer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/producers/SimpleProducer.cpp?rev=887584&r1=887583&r2=887584&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/producers/SimpleProducer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/producers/SimpleProducer.cpp Sat Dec 5 20:20:36 2009
@@ -81,6 +81,10 @@
cleanup();
}

+ void close() {
+ this->cleanup();
+ }
+
virtual void run() {
try {
// Create a ConnectionFactory
@@ -226,6 +230,7 @@
// Create the producer and run it.
SimpleProducer producer( brokerURI, numMessages, destURI, useTopics );
producer.run();
+ producer.close();

std::cout << "-----------------------------------------------------\n";
std::cout << "Finished with the example." << std::endl;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=887584&r1=887583&r2=887584&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Sat Dec 5 20:20:36 2009
@@ -118,6 +118,9 @@

try {

+ // Now indicate that this session is closed.
+ closed = true;
+
// Stop the dispatch executor.
stop();

@@ -163,9 +166,6 @@
info->setObjectId( this->sessionInfo->getSessionId() );
info->setLastDeliveredSequenceId( this->lastDeliveredSequenceId );
this->connection->oneway( info );
-
- // Now indicate that this session is closed.
- closed = true;
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

svn commit: r887564 - in /activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch: ./ internal/ internal/advanced/

2009-12-05T08:43:51Z

Author: chirino
Date: Sat Dec 5 16:43:47 2009
New Revision: 887564

URL: http://svn.apache.org/viewvc?rev=887564&view=rev
Log:
simplifying the advanced package a bit

Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedSerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ForeignEvent.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/TimerEvent.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/UpdateEvent.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/SimpleLoadBalancer.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java?rev=887564&r1=887563&r2=887564&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java Sat Dec 5 16:43:47 2009
@@ -43,7 +43,7 @@
return new SimpleDispatchSPI(Runtime.getRuntime().availableProcessors());
}

- synchronized private static DispatchSPI spi() {
+ synchronized public static DispatchSPI spi() {
if(spi==null) {
spi = cretateDispatchSystemSPI();
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java?rev=887564&r1=887563&r2=887564&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java Sat Dec 5 16:43:47 2009
@@ -48,7 +48,7 @@
public void resume() {
if( suspendCounter.decrementAndGet() == 0 ) {
if( size.get() != 0 ) {
- targetQueue.dispatchAsync(this);
+ dispatchSelfAsync();
}
}
}
@@ -71,10 +71,14 @@
}
runnables.add(runnable);
if( lastSize == 0 && suspendCounter.get()<=0 ) {
- targetQueue.dispatchAsync(this);
+ dispatchSelfAsync();
}
}

+ protected void dispatchSelfAsync() {
+ targetQueue.dispatchAsync(this);
+ }
+
public void run() {
DispatchQueue original = DispatchSystem.CURRENT_QUEUE.get();
DispatchSystem.CURRENT_QUEUE.set(this);

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java?rev=887564&r1=887563&r2=887564&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatchSPI.java Sat Dec 5 16:43:47 2009
@@ -38,8 +38,6 @@
final GlobalDispatchQueue globalQueues[];
final AtomicLong globalQueuedRunnables = new AtomicLong();

- private final ThreadLocal<DispatcherThread> dispatcher = new ThreadLocal<DispatcherThread>();
- private final ThreadLocal<DispatchContext> dispatcherContext = new ThreadLocal<DispatchContext>();
private final ArrayList<DispatcherThread> dispatchers = new ArrayList<DispatcherThread>();

final AtomicInteger startCounter = new AtomicInteger();
@@ -115,30 +113,12 @@
}
}

- public void setCurrentDispatchContext(DispatchContext context) {
- dispatcherContext.set(context);
- }
-
- public DispatchContext getCurrentDispatchContext() {
- return dispatcherContext.get();
- }
-
- /**
- * Returns the currently executing dispatcher, or null if the current thread
- * is not a dispatcher:
- *
- * @return The currently executing dispatcher
- */
- public DispatcherThread getCurrentDispatcher() {
- return dispatcher.get();
- }
-
/**
* A Dispatcher must call this to indicate that is has started it's dispatch
* loop.
*/
public void onDispatcherStarted(DispatcherThread d) {
- dispatcher.set(d);
+ DispatcherThread.CURRENT.set(d);
loadBalancer.onDispatcherStarted(d);
}

@@ -159,7 +139,7 @@
}

protected DispatcherThread chooseDispatcher() {
- DispatcherThread d = dispatcher.get();
+ DispatcherThread d = DispatcherThread.CURRENT.get();
if (d == null) {
synchronized (dispatchers) {
if(dispatchers.isEmpty())
@@ -223,7 +203,7 @@
}

public DispatchQueue createQueue(String label) {
- SerialDispatchQueue rc = new SerialDispatchQueue(label);
+ AdvancedSerialDispatchQueue rc = new AdvancedSerialDispatchQueue(label);
rc.setTargetQueue(getGlobalQueue(DEFAULT));
return rc;
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedQueue.java?rev=887564&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedQueue.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedQueue.java Sat Dec 5 16:43:47 2009
@@ -0,0 +1,5 @@
+package org.apache.activemq.dispatch.internal.advanced;
+
+public interface AdvancedQueue {
+
+}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedSerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedSerialDispatchQueue.java?rev=887564&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedSerialDispatchQueue.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedSerialDispatchQueue.java Sat Dec 5 16:43:47 2009
@@ -0,0 +1,19 @@
+package org.apache.activemq.dispatch.internal.advanced;
+
+import org.apache.activemq.dispatch.internal.SerialDispatchQueue;
+
+public class AdvancedSerialDispatchQueue extends SerialDispatchQueue {
+
+
+ public AdvancedSerialDispatchQueue(String label) {
+ super(label);
+// context = new DispatchContext(this, true, label);
+}
+
+// @Override
+// protected void dispatchSelfAsync() {
+// AdvancedQueue aq = ((AdvancedQueue)targetQueue);
+// super.dispatchSelfAsync();
+// }
+
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java?rev=887564&r1=887563&r2=887564&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatchContext.java Sat Dec 5 16:43:47 2009
@@ -3,29 +3,30 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.RejectedExecutionException;

-import org.apache.activemq.dispatch.internal.advanced.DispatcherThread.UpdateEvent;
import org.apache.activemq.util.list.LinkedNode;

/**
*
*/
-class DispatchContext extends LinkedNode<DispatchContext> {
+class DispatchContext extends LinkedNode<DispatchContext> implements Runnable {
+
+ public static final ThreadLocal<DispatchContext> CURRENT = new ThreadLocal<DispatchContext>();

- private final DispatcherThread dispacher;
// The target:
private final Runnable runnable;
// The name of this context:
- final String name;
+ final String label;
+
// list prio can only be updated in the thread of of the owning
// dispatcher
protected int listPrio;

// The update events are used to update fields in the dispatch context
// from foreign threads:
- final UpdateEvent updateEvent[];
+ final UpdateEvent updateEvent[] = new UpdateEvent[2];

final DispatchObserver tracker;
- protected DispatcherThread currentOwner;
+ protected DispatcherThread target;
private DispatcherThread updateDispatcher = null;

int priority;
@@ -33,36 +34,22 @@
private boolean closed = false;
final CountDownLatch closeLatch = new CountDownLatch(1);

- protected DispatchContext(DispatcherThread dispatcherThread, Runnable runnable, boolean persistent, String name) {
- dispacher = dispatcherThread;
+ protected DispatchContext(DispatcherThread thread, Runnable runnable, boolean persistent, String label) {
this.runnable = runnable;
- this.name = name;
- this.currentOwner = (DispatcherThread) dispacher;
- if (persistent && dispacher.spi != null) {
- this.tracker = dispacher.spi.getLoadBalancer().createExecutionTracker((DispatchContext) this);
+ this.label = label;
+ this.target = thread;
+ if (persistent && target.spi != null) {
+ this.tracker = target.spi.getLoadBalancer().createExecutionTracker((DispatchContext) this);
} else {
this.tracker = null;
}
- updateEvent = createUpdateEvent();
- updateEvent[0] = dispacher.new UpdateEvent(this);
- updateEvent[1] = dispacher.new UpdateEvent(this);
+ updateEvent[0] = new UpdateEvent(this);
+ updateEvent[1] = new UpdateEvent(this);
if (persistent) {
- currentOwner.takeOwnership(this);
+ target.takeOwnership(this);
}
}

- private final DispatcherThread.UpdateEvent[] createUpdateEvent() {
- return new DispatcherThread.UpdateEvent[2];
- }
-
- /**
- * Gets the execution tracker for the context.
- *
- * @return the execution tracker for the context:
- */
- public DispatchObserver getExecutionTracker() {
- return tracker;
- }

/**
* This can only be called by the owning dispatch thread:
@@ -77,7 +64,7 @@
synchronized (this) {

// If we're already set to this dispatcher
- if (newDispatcher == currentOwner) {
+ if (newDispatcher == target) {
if (updateDispatcher == null || updateDispatcher == newDispatcher) {
return;
}
@@ -85,18 +72,18 @@

updateDispatcher = (DispatcherThread) newDispatcher;
if (DispatcherThread.DEBUG)
- System.out.println(getName() + " updating to " + updateDispatcher);
+ System.out.println(getLabel() + " updating to " + updateDispatcher);

- currentOwner.onForeignUpdate(this);
+ target.onForeignUpdate(this);
}

}

public void requestDispatch() {

- DispatcherThread callingDispatcher = dispacher.getCurrentDispatcher();
+ DispatcherThread callingDispatcher = DispatcherThread.CURRENT.get();
if (tracker != null)
- tracker.onDispatch(callingDispatcher, dispacher.getCurrentDispatchContext());
+ tracker.onDispatch(callingDispatcher, DispatchContext.CURRENT.get());

// Otherwise this is coming off another thread, so we need to
// synchronize
@@ -104,22 +91,22 @@
synchronized (this) {
// If the owner of this context is the calling thread, then
// delegate to the dispatcher.
- if (currentOwner == callingDispatcher) {
+ if (target == callingDispatcher) {

- if (!currentOwner.running) {
+ if (!target.running) {
// TODO In the event that the current dispatcher
// failed due to a runtime exception, we could
// try to switch to a new dispatcher.
throw new RejectedExecutionException();
}
if (!isLinked()) {
- currentOwner.priorityQueue.add(this, listPrio);
+ target.priorityQueue.add(this, listPrio);
}
return;
}

dispatchRequested = true;
- currentOwner.onForeignUpdate(this);
+ target.onForeignUpdate(this);
}
}

@@ -129,12 +116,12 @@
return;
}

- priority = Math.min(priority, dispacher.MAX_USER_PRIORITY);
+ priority = Math.min(priority, target.MAX_USER_PRIORITY);

if (this.priority == priority) {
return;
}
- DispatcherThread callingDispatcher = dispacher.getCurrentDispatcher();
+ DispatcherThread callingDispatcher = DispatcherThread.CURRENT.get();

// Otherwise this is coming off another thread, so we need to
// synchronize to protect against ownership changes:
@@ -146,7 +133,7 @@

// If this is called by the owning dispatcher, then we go ahead
// and update:
- if (currentOwner == callingDispatcher) {
+ if (target == callingDispatcher) {

if (priority != listPrio) {

@@ -155,13 +142,13 @@
// at the new priority:
if (isLinked()) {
unlink();
- currentOwner.priorityQueue.add(this, listPrio);
+ target.priorityQueue.add(this, listPrio);
}
}
return;
}

- currentOwner.onForeignUpdate(this);
+ target.onForeignUpdate(this);
}

}
@@ -176,16 +163,16 @@

if (updateDispatcher != null && updateDispatcher.takeOwnership(this)) {
if (DispatcherThread.DEBUG) {
- System.out.println("Assigning " + getName() + " to " + updateDispatcher);
+ System.out.println("Assigning " + getLabel() + " to " + updateDispatcher);
}

- if (currentOwner.removeDispatchContext(this)) {
+ if (target.removeDispatchContext(this)) {
dispatchRequested = true;
}

updateDispatcher.onForeignUpdate(this);
- switchedDispatcher(currentOwner, updateDispatcher);
- currentOwner = updateDispatcher;
+ switchedDispatcher(target, updateDispatcher);
+ target = updateDispatcher;
updateDispatcher = null;

} else {
@@ -199,14 +186,7 @@
}
}

- /**
- * May be overriden by subclass to additional work on dispatcher switch
- *
- * @param oldDispatcher The old dispatcher
- * @param newDispatcher The new Dispatcher
- */
protected void switchedDispatcher(DispatcherThread oldDispatcher, DispatcherThread newDispatcher) {
-
}

public boolean isClosed() {
@@ -214,20 +194,20 @@
}

public void close(boolean sync) {
- DispatcherThread callingDispatcher = dispacher.getCurrentDispatcher();
+ DispatcherThread callingDispatcher = DispatcherThread.CURRENT.get();
// System.out.println(this + "Closing");
synchronized (this) {
closed = true;
// If the owner of this context is the calling thread, then
// delegate to the dispatcher.
- if (currentOwner == callingDispatcher) {
- dispacher.removeDispatchContext(this);
+ if (target == callingDispatcher) {
+ target.removeDispatchContext(this);
closeLatch.countDown();
return;
}
}

- currentOwner.onForeignUpdate(this);
+ target.onForeignUpdate(this);
if (sync) {
boolean interrupted = false;
while (true) {
@@ -245,16 +225,12 @@
}
}

- public final String toString() {
- return getName();
- }
-
public DispatcherThread getTargetQueue() {
- return currentOwner;
+ return target;
}

- public String getName() {
- return name;
+ public String getLabel() {
+ return label;
}

}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java?rev=887564&r1=887563&r2=887564&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java Sat Dec 5 16:43:47 2009
@@ -29,11 +29,12 @@
import org.apache.activemq.util.Mapper;
import org.apache.activemq.util.PriorityLinkedList;
import org.apache.activemq.util.TimerHeap;
-import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;

public class DispatcherThread implements Runnable {

+ static public final ThreadLocal<DispatcherThread> CURRENT = new ThreadLocal<DispatcherThread>();
+
private final ThreadDispatchQueue dispatchQueues[];

static final boolean DEBUG = false;
@@ -50,9 +51,10 @@
protected final PriorityLinkedList<DispatchContext> priorityQueue;

// Dispatch queue for requests from other threads:
- private final LinkedNodeList<ForeignEvent>[] foreignQueue;
+ final LinkedNodeList<ForeignEvent>[] foreignQueue = createForeignQueue();
+
private static final int[] TOGGLE = new int[] { 1, 0 };
- private int foreignToggle = 0;
+ int foreignToggle = 0;

// Timed Execution List
protected final TimerHeap<Runnable> timerHeap = new TimerHeap<Runnable>() {
@@ -63,7 +65,7 @@
};

protected final String name;
- private final AtomicBoolean foreignAvailable = new AtomicBoolean(false);
+ final AtomicBoolean foreignAvailable = new AtomicBoolean(false);
private final Semaphore foreignPermits = new Semaphore(0);

private final Mapper<Integer, DispatchContext> PRIORITY_MAPPER = new Mapper<Integer, DispatchContext>() {
@@ -82,33 +84,17 @@

MAX_USER_PRIORITY = priorities - 1;
priorityQueue = new PriorityLinkedList<DispatchContext>(MAX_USER_PRIORITY + 1, PRIORITY_MAPPER);
- foreignQueue = createForeignEventQueue();
for (int i = 0; i < 2; i++) {
foreignQueue[i] = new LinkedNodeList<ForeignEvent>();
}
this.spi = spi;
}
-
+
@SuppressWarnings("unchecked")
- private LinkedNodeList<ForeignEvent>[] createForeignEventQueue() {
+ private LinkedNodeList<ForeignEvent>[] createForeignQueue() {
return new LinkedNodeList[2];
}

- protected abstract class ForeignEvent extends LinkedNode<ForeignEvent> {
- public abstract void execute();
-
- final void addToList() {
- synchronized (foreignQueue) {
- if (!this.isLinked()) {
- foreignQueue[foreignToggle].addLast(this);
- if (!foreignAvailable.getAndSet(true)) {
- wakeup();
- }
- }
- }
- }
- }
-
public boolean isThreaded() {
return threaded;
}
@@ -121,19 +107,6 @@
return MAX_USER_PRIORITY;
}

- class UpdateEvent extends ForeignEvent {
- private final DispatchContext pdc;
-
- UpdateEvent(DispatchContext pdc) {
- this.pdc = pdc;
- }
-
- // Can only be called by the owner of this dispatch context:
- public void execute() {
- pdc.processForeignUpdates();
- }
- }
-
public DispatchContext register(Runnable runnable, String name) {
return new DispatchContext(this, runnable, true, name);
}
@@ -202,11 +175,7 @@

public void run() {

- if (spi != null) {
- // Inform the dispatcher that we have started:
- spi.onDispatcherStarted((DispatcherThread) this);
- }
-
+ spi.onDispatcherStarted((DispatcherThread) this);
DispatchContext pdc;
try {
while (running) {
@@ -218,14 +187,14 @@
}

if (pdc.tracker != null) {
- spi.setCurrentDispatchContext(pdc);
+ DispatchContext.CURRENT.set(pdc);
}

counter++;
pdc.run();

if (pdc.tracker != null) {
- spi.setCurrentDispatchContext(null);
+ DispatchContext.CURRENT.set(null);
}
}

@@ -256,7 +225,7 @@
}

fe.unlink();
- fe.execute();
+ fe.run();
}
}
}
@@ -265,9 +234,7 @@
} catch (Throwable thrown) {
thrown.printStackTrace();
} finally {
- if (spi != null) {
- spi.onDispatcherStopped((DispatcherThread) this);
- }
+ spi.onDispatcherStopped((DispatcherThread) this);
cleanup();
}
}
@@ -354,13 +321,6 @@
context.requestDispatch();
}

- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.activemq.dispatch.IDispatcher#dispatch(org.apache.activemq
- * .dispatch.Dispatcher.Dispatchable)
- */
public final void dispatch(Runnable runnable, int priority) {
DispatchContext context = new DispatchContext(this, runnable, false, name);
context.updatePriority(priority);
@@ -390,13 +350,6 @@
dispatch(runnable, prio);
}

- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.activemq.dispatch.IDispatcher#schedule(java.lang.Runnable,
- * long, java.util.concurrent.TimeUnit)
- */
public void schedule(final Runnable runnable, final long delay, final TimeUnit timeUnit) {
schedule(runnable, 0, delay, timeUnit);
}
@@ -407,36 +360,29 @@
execute(runnable, prio);
}
};
- if (getCurrentDispatcher() == this) {
+ if (DispatcherThread.CURRENT.get() == this) {
timerHeap.addRelative(wrapper, delay, timeUnit);
} else {
- new ForeignEvent() {
- public void execute() {
- timerHeap.addRelative(wrapper, delay, timeUnit);
+ add(new TimerEvent(this, wrapper, delay, timeUnit));
+ }
+ }
+
+ final void add(ForeignEvent event) {
+ synchronized (foreignQueue) {
+ if (!event.isLinked()) {
+ foreignQueue[foreignToggle].addLast(event);
+ if (!foreignAvailable.getAndSet(true)) {
+ wakeup();
}
- }.addToList();
+ }
}
}

+
public String toString() {
return name;
}

- final DispatcherThread getCurrentDispatcher() {
- if (spi != null) {
- return (DispatcherThread) spi.getCurrentDispatcher();
- } else if (Thread.currentThread() == thread) {
- return (DispatcherThread) this;
- } else {
- return null;
- }
-
- }
-
- final DispatchContext getCurrentDispatchContext() {
- return spi.getCurrentDispatchContext();
- }
-
public String getName() {
return name;
}

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ForeignEvent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ForeignEvent.java?rev=887564&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ForeignEvent.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/ForeignEvent.java Sat Dec 5 16:43:47 2009
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch.internal.advanced;
+
+import org.apache.activemq.util.list.LinkedNode;
+
+abstract class ForeignEvent extends LinkedNode<ForeignEvent> implements Runnable {
+}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/SimpleLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/SimpleLoadBalancer.java?rev=887564&r1=887563&r2=887564&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/SimpleLoadBalancer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/SimpleLoadBalancer.java Sat Dec 5 16:43:47 2009
@@ -28,7 +28,7 @@

private final boolean DEBUG = false;

- //TODO: Added plumbing for periodic rebalancing which we should
+ //TODO: Added plumbing for periodic re-balancing which we should
//consider implementing
private static final boolean ENABLE_UPDATES = false;
private final ArrayList<DispatcherThread> dispatchers = new ArrayList<DispatcherThread>();

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/TimerEvent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/TimerEvent.java?rev=887564&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/TimerEvent.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/TimerEvent.java Sat Dec 5 16:43:47 2009
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch.internal.advanced;
+
+import java.util.concurrent.TimeUnit;
+
+final class TimerEvent extends ForeignEvent {
+
+ private final long delay;
+ private final Runnable wrapper;
+ private final TimeUnit timeUnit;
+ private final DispatcherThread thread;
+
+ public TimerEvent(DispatcherThread thread, Runnable wrapper, long delay, TimeUnit timeUnit) {
+ this.thread = thread;
+ this.delay = delay;
+ this.wrapper = wrapper;
+ this.timeUnit = timeUnit;
+ }
+
+ public void run() {
+ thread.timerHeap.addRelative(wrapper, delay, timeUnit);
+ }
+}
\ No newline at end of file

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/UpdateEvent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/UpdateEvent.java?rev=887564&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/UpdateEvent.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/UpdateEvent.java Sat Dec 5 16:43:47 2009
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.dispatch.internal.advanced;
+
+
+class UpdateEvent extends ForeignEvent {
+ protected final DispatchContext dispatchContext;
+
+ public UpdateEvent(DispatchContext dispatchContext) {
+ this.dispatchContext = dispatchContext;
+ }
+
+ // Can only be called by the owner of this dispatch context:
+ public void run() {
+ dispatchContext.processForeignUpdates();
+ }
+}
\ No newline at end of file

svn commit: r887556 - /activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java

2009-12-05T08:23:13Z

Author: chirino
Date: Sat Dec 5 16:23:11 2009
New Revision: 887556

URL: http://svn.apache.org/viewvc?rev=887556&view=rev
Log:
added some code that can dump the generated class file for inspection/debugging

Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java?rev=887556&r1=887555&r2=887556&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java Sat Dec 5 16:23:11 2009
@@ -7,8 +7,10 @@
**************************************************************************************/
package org.apache.activemq.actor;

+import java.io.FileOutputStream;
import java.lang.reflect.Method;

+import net.sf.cglib.core.DefaultGeneratorStrategy;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
@@ -31,6 +33,20 @@
e.setSuperclass(target.getClass());
e.setInterfaces(interfaces);
e.setCallback(new ActorMethodInterceptor(queue));
+// Un-comment the following if you want store the generated class file:
+// e.setStrategy(new DefaultGeneratorStrategy() {
+// protected byte[] transform(byte[] b) {
+// try {
+// FileOutputStream os = new FileOutputStream("test.class");
+// os.write(b);
+// os.close();
+// } catch (Throwable e) {
+// e.printStackTrace();
+// }
+// return b;
+// }
+// });
+
return (T) e.create();
}

@@ -50,7 +66,8 @@
/**
* Tests if a given method has a Message annotation
*
- * @param method The mehod.
+ * @param method
+ * The mehod.
*/
private static boolean isMessage(Method method) {
if (method.isAnnotationPresent(Message.class)) {

svn commit: r887448 - in /activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src: main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java test/java/org/apache/activemq/actor/ActorTest.java

2009-12-04T15:25:30Z

Author: chirino
Date: Fri Dec 4 23:25:30 2009
New Revision: 887448

URL: http://svn.apache.org/viewvc?rev=887448&view=rev
Log:
Redispatch the serial queue once resumed

Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java?rev=887448&r1=887447&r2=887448&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/SerialDispatchQueue.java Fri Dec 4 23:25:30 2009
@@ -46,7 +46,11 @@
}

public void resume() {
- suspendCounter.decrementAndGet();
+ if( suspendCounter.decrementAndGet() == 0 ) {
+ if( size.get() != 0 ) {
+ targetQueue.dispatchAsync(this);
+ }
+ }
}

public void suspend() {
@@ -66,7 +70,7 @@
retain();
}
runnables.add(runnable);
- if( targetQueue!=null && lastSize == 0 && suspendCounter.get()<=0 ) {
+ if( lastSize == 0 && suspendCounter.get()<=0 ) {
targetQueue.dispatchAsync(this);
}
}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887448&r1=887447&r2=887448&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Fri Dec 4 23:25:30 2009
@@ -7,8 +7,6 @@
**************************************************************************************/
package org.apache.activemq.actor;

-import static java.lang.String.format;
-
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

@@ -16,7 +14,6 @@

import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchSPI;
-import org.apache.activemq.dispatch.DispatchSystem;
import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;

svn commit: r887445 - /activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java

2009-12-04T15:23:34Z

Author: cmacnaug
Date: Fri Dec 4 23:23:34 2009
New Revision: 887445

URL: http://svn.apache.org/viewvc?rev=887445&view=rev
Log:
Fixing unittest problem

Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887445&r1=887444&r2=887445&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Fri Dec 4 23:23:34 2009
@@ -7,6 +7,8 @@
**************************************************************************************/
package org.apache.activemq.actor;

+import static java.lang.String.format;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

@@ -14,6 +16,7 @@

import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchSPI;
+import org.apache.activemq.dispatch.DispatchSystem;
import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;

@@ -54,14 +57,13 @@
CountDownLatch latch = new CountDownLatch(1);
testObject.actorInvocation(latch);
assertTrue(latch.await(1, TimeUnit.SECONDS));
-
- latch = new CountDownLatch(1);
+
queue.suspend();
- assertFalse(latch.await(2, TimeUnit.SECONDS));
+ latch = new CountDownLatch(1);
+ testObject.actorInvocation(latch);
+ assertFalse("Suspended Queue shouldn't invoked method", latch.await(2, TimeUnit.SECONDS));

queue.resume();
- assertTrue(latch.await(2, TimeUnit.SECONDS));
-
+ assertTrue("Resumed Queue should invoke method", latch.await(2, TimeUnit.SECONDS));
}
-
}

svn commit: r887437 - in /activemq/sandbox/activemq-apollo-actor/activemq-dispatcher: ./ src/main/java/org/apache/activemq/actor/ src/test/java/org/apache/activemq/actor/

2009-12-04T15:12:01Z

Author: cmacnaug
Date: Fri Dec 4 23:12:00 2009
New Revision: 887437

URL: http://svn.apache.org/viewvc?rev=887437&view=rev
Log:
Adding Actor class which facilitates create wrappers around Actor classes to perform method execution on a DispatchQueue

Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java (with props)
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Message.java (with props)
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (with props)
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/pom.xml

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/pom.xml?rev=887437&r1=887436&r2=887437&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/pom.xml Fri Dec 4 23:12:00 2009
@@ -49,6 +49,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ </dependency>

</dependencies>

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java?rev=887437&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java Fri Dec 4 23:12:00 2009
@@ -0,0 +1,98 @@
+/**************************************************************************************
+ * Copyright (C) 2009 Progress Software, Inc. All rights reserved. *
+ * http://fusesource.com *
+ * ---------------------------------------------------------------------------------- *
+ * The software in this package is published under the terms of the AGPL license *
+ * a copy of which has been included with this distribution in the license.txt file. *
+ **************************************************************************************/
+package org.apache.activemq.actor;
+
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+import org.apache.activemq.dispatch.DispatchQueue;
+
+/**
+ * Allows creation of wrapper objects that intercept {@link Message} annotated
+ * methods and dispatch them asynchronously on a given {@link DispatchQueue}.
+ *
+ * @author cmacnaug
+ * @version 1.0
+ */
+public class Actor {
+
+ public static <T> T create(T target, DispatchQueue queue, Class<?>... interfaces) {
+
+ validateMessageMethods(target);
+ Enhancer e = new Enhancer();
+ e.setSuperclass(target.getClass());
+ e.setInterfaces(interfaces);
+ e.setCallback(new ActorMethodInterceptor(queue));
+ return (T) e.create();
+ }
+
+ private static final <T> void validateMessageMethods(T target) throws IllegalArgumentException {
+ for (Method m : target.getClass().getDeclaredMethods()) {
+ if (isMessage(m)) {
+ if (m.getReturnType() == null) {
+ throw new IllegalArgumentException("Illegal method declaration: " + m + ". Actor methods must return void");
+ }
+ if (m.getExceptionTypes().length > 0) {
+ throw new IllegalArgumentException("Illegal method declaration: " + m + ". Actor methods must not throw exceptions");
+ }
+ }
+ }
+ }
+
+ /**
+ * Tests if a given method has a Message annotation
+ *
+ * @param method The mehod.
+ */
+ private static boolean isMessage(Method method) {
+ if (method.isAnnotationPresent(Message.class)) {
+ return true;
+ }
+ if (method.getDeclaringClass().isAnnotationPresent(Message.class)) {
+ return true;
+ }
+ return false;
+ }
+
+ private static class ActorMethodInterceptor implements MethodInterceptor {
+
+ private final DispatchQueue queue;
+
+ ActorMethodInterceptor(DispatchQueue queue) {
+ this.queue = queue;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.sf.cglib.proxy.MethodInterceptor#intercept(java.lang.Object,
+ * java.lang.reflect.Method, java.lang.Object[],
+ * net.sf.cglib.proxy.MethodProxy)
+ */
+ public Object intercept(final Object obj, Method method, final Object[] args, final MethodProxy proxy) throws Throwable {
+ if (isMessage(method)) {
+ queue.dispatchAsync(new Runnable() {
+ public void run() {
+ try {
+ proxy.invokeSuper(obj, args);
+ } catch (Throwable thrown) {
+ throw new IllegalStateException(thrown);
+ }
+ }
+ });
+ return null;
+ } else {
+ return proxy.invokeSuper(obj, args);
+ }
+ }
+ }
+
+}

Propchange: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Actor.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Message.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Message.java?rev=887437&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Message.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Message.java Fri Dec 4 23:12:00 2009
@@ -0,0 +1,25 @@
+/**************************************************************************************
+ * Copyright (C) 2009 Progress Software, Inc. All rights reserved. *
+ * http://fusesource.com *
+ * ---------------------------------------------------------------------------------- *
+ * The software in this package is published under the terms of the AGPL license *
+ * a copy of which has been included with this distribution in the license.txt file. *
+ **************************************************************************************/
+package org.apache.activemq.actor;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+/**
+ * Indicates that a given method, class or interface should be treated as an actor.
+ *
+ * @author cmacnaug
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target( { java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE })
+public @interface Message {
+
+}

Propchange: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/Message.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887437&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Fri Dec 4 23:12:00 2009
@@ -0,0 +1,67 @@
+/**************************************************************************************
+ * Copyright (C) 2009 Progress Software, Inc. All rights reserved. *
+ * http://fusesource.com *
+ * ---------------------------------------------------------------------------------- *
+ * The software in this package is published under the terms of the AGPL license *
+ * a copy of which has been included with this distribution in the license.txt file. *
+ **************************************************************************************/
+package org.apache.activemq.actor;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.TestCase;
+
+import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatchSPI;
+import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatchSPI;
+
+
+/**
+ * ActorTest
+ * <p>
+ * Description:
+ * </p>
+ * @author cmacnaug
+ * @version 1.0
+ */
+public class ActorTest extends TestCase {
+
+
+ public static class ActorTestObject
+ {
+ @Message
+ public void actorInvocation(CountDownLatch latch)
+ {
+ latch.countDown();
+ }
+
+ public void straightThrough(CountDownLatch latch)
+ {
+ latch.countDown();
+ }
+
+ }
+
+ public void testActorInvocation() throws Exception
+ {
+ DispatchSPI advancedSystem = new AdvancedDispatchSPI(Runtime.getRuntime().availableProcessors(), 3);
+ advancedSystem.start();
+
+ DispatchQueue queue = advancedSystem.createQueue("test");
+ ActorTestObject testObject = Actor.create(new ActorTestObject(), queue);
+
+ CountDownLatch latch = new CountDownLatch(1);
+ testObject.actorInvocation(latch);
+ assertTrue(latch.await(1, TimeUnit.SECONDS));
+
+ latch = new CountDownLatch(1);
+ queue.suspend();
+ assertFalse(latch.await(2, TimeUnit.SECONDS));
+
+ queue.resume();
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
+
+ }
+
+}

Propchange: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
------------------------------------------------------------------------------
svn:eol-style = native

svn commit: r887420 [1/3] - in /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk: ./ src/main/csharp/ src/main/csharp/Commands/ src/main/csharp/Threads/

2009-12-04T14:53:42Z

Author: tabish
Date: Fri Dec 4 22:53:41 2009
New Revision: 887420

URL: http://svn.apache.org/viewvc?rev=887420&view=rev
Log:
Fixing some compiler errors and bringing in more NMS Implementation for Stomp.

Added:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/DataStructureTypes.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/IDispatcher.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/ISynchronization.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageConsumer.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageProducer.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/PrefetchPolicy.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Session.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/SessionExecutor.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/Task.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunner.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunnerFactory.cs (with props)
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/TransactionContext.cs (with props)
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseCommand.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseMessage.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BrokerError.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BytesMessage.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Command.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionId.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ExceptionResponse.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageAck.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageDispatch.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageId.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerId.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Queue.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/RemoveInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Response.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionId.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ShutdownInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/StreamMessage.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SubscriptionInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempDestination.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TextMessage.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionInfo.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/vs2008-stomp.csproj

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseCommand.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseCommand.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseCommand.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseCommand.cs Fri Dec 4 22:53:41 2009
@@ -15,15 +15,6 @@
* limitations under the License.
*/

-//
-// Marshalling code for Open Wire Format for BaseCommand
-//
-//
-// NOTE!: This file is autogenerated - do not modify!
-// if you need to make a change, please see the Groovy scripts in the
-// activemq-openwire module
-//
-
using System;

namespace Apache.NMS.Stomp.Commands
@@ -57,7 +48,7 @@

public override String ToString()
{
- string answer = GetDataStructureTypeAsString(GetDataStructureType());
+ string answer = DataStructureTypes.GetDataStructureTypeAsString(GetDataStructureType());
if(answer.Length == 0)
{
answer = base.ToString();
@@ -65,69 +56,6 @@
return answer + ": id = " + CommandId;
}

- public static String GetDataStructureTypeAsString(int type)
- {
- String packetTypeStr = "";
- switch(type)
- {
- case ActiveMQMessage.ID_ACTIVEMQMESSAGE:
- packetTypeStr = "ACTIVEMQ_MESSAGE";
- break;
- case ActiveMQTextMessage.ID_ACTIVEMQTEXTMESSAGE:
- packetTypeStr = "ACTIVEMQ_TEXT_MESSAGE";
- break;
- case ActiveMQObjectMessage.ID_ACTIVEMQOBJECTMESSAGE:
- packetTypeStr = "ACTIVEMQ_OBJECT_MESSAGE";
- break;
- case ActiveMQBytesMessage.ID_ACTIVEMQBYTESMESSAGE:
- packetTypeStr = "ACTIVEMQ_BYTES_MESSAGE";
- break;
- case ActiveMQStreamMessage.ID_ACTIVEMQSTREAMMESSAGE:
- packetTypeStr = "ACTIVEMQ_STREAM_MESSAGE";
- break;
- case ActiveMQMapMessage.ID_ACTIVEMQMAPMESSAGE:
- packetTypeStr = "ACTIVEMQ_MAP_MESSAGE";
- break;
- case MessageAck.ID_MESSAGEACK:
- packetTypeStr = "ACTIVEMQ_MSG_ACK";
- break;
- case Response.ID_RESPONSE:
- packetTypeStr = "RESPONSE";
- break;
- case ConsumerInfo.ID_CONSUMERINFO:
- packetTypeStr = "CONSUMER_INFO";
- break;
- case ProducerInfo.ID_PRODUCERINFO:
- packetTypeStr = "PRODUCER_INFO";
- break;
- case TransactionInfo.ID_TRANSACTIONINFO:
- packetTypeStr = "TRANSACTION_INFO";
- break;
- case BrokerInfo.ID_BROKERINFO:
- packetTypeStr = "BROKER_INFO";
- break;
- case ConnectionInfo.ID_CONNECTIONINFO:
- packetTypeStr = "CONNECTION_INFO";
- break;
- case SessionInfo.ID_SESSIONINFO:
- packetTypeStr = "SESSION_INFO";
- break;
- case RemoveSubscriptionInfo.ID_REMOVESUBSCRIPTIONINFO:
- packetTypeStr = "DURABLE_UNSUBSCRIBE";
- break;
- case IntegerResponse.ID_INTEGERRESPONSE:
- packetTypeStr = "INT_RESPONSE_RECEIPT_INFO";
- break;
- case WireFormatInfo.ID_WIREFORMATINFO:
- packetTypeStr = "WIRE_FORMAT_INFO";
- break;
- case RemoveInfo.ID_REMOVEINFO:
- packetTypeStr = "REMOVE_INFO";
- break;
- }
- return packetTypeStr;
- }
-
public virtual bool IsBrokerInfo
{
get
@@ -264,7 +192,7 @@
}
}

- public virtual bool IsWireFormatInfo
+ public virtual bool IsErrorCommand
{
get
{

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseMessage.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BaseMessage.cs Fri Dec 4 22:53:41 2009
@@ -24,8 +24,6 @@
{
public class BaseMessage : BaseCommand, MarshallAware, ICloneable
{
- public const byte ID_MESSAGE = 0;
-
ProducerId producerId;
Destination destination;
TransactionId transactionId;
@@ -52,17 +50,6 @@

///
/// <summery>
- /// Get the unique identifier that this object and its own
- /// Marshaler share.
- /// </summery>
- ///
- public override byte GetDataStructureType()
- {
- return ID_MESSAGE;
- }
-
- ///
- /// <summery>
/// Clone this object and return a new instance that the caller now owns.
/// </summery>
///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BrokerError.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BrokerError.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BrokerError.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BrokerError.cs Fri Dec 4 22:53:41 2009
@@ -38,6 +38,11 @@
private StackTraceElement[] stackTraceElements = {};
private BrokerError cause;

+ public override byte GetDataStructureType()
+ {
+ return DataStructureTypes.ErrorType;
+ }
+
public string Message
{
get { return message; }

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BytesMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BytesMessage.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BytesMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/BytesMessage.cs Fri Dec 4 22:53:41 2009
@@ -25,8 +25,6 @@
{
public class BytesMessage : Message, IBytesMessage
{
- public const byte ID_ACTIVEMQBYTESMESSAGE = 24;
-
private EndianBinaryReader dataIn = null;
private EndianBinaryWriter dataOut = null;
private MemoryStream outputBuffer = null;
@@ -34,7 +32,7 @@

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQBYTESMESSAGE;
+ return DataStructureTypes.BytesMessageType;
}

public override Object Clone()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Command.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Command.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Command.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Command.cs Fri Dec 4 22:53:41 2009
@@ -41,11 +41,6 @@
get;
}

- bool IsConnectedCommand
- {
- get;
- }
-
bool IsErrorCommand
{
get;

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionId.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionId.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionId.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class ConnectionId : BaseDataStructure
{
- public const byte ID_CONNECTIONID = 120;
-
string value;

public ConnectionId()
@@ -53,7 +51,7 @@
///
public override byte GetDataStructureType()
{
- return ID_CONNECTIONID;
+ return DataStructureTypes.ConnectionIdType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ConnectionInfo.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class ConnectionInfo : BaseCommand
{
- public const byte ID_CONNECTIONINFO = 3;
-
ConnectionId connectionId;
string clientId;
string password;
@@ -37,7 +35,7 @@
///
public override byte GetDataStructureType()
{
- return ID_CONNECTIONINFO;
+ return DataStructureTypes.ConnectionInfoType;
}

///

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/DataStructureTypes.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/DataStructureTypes.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/DataStructureTypes.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/DataStructureTypes.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Apache.NMS.Stomp.Commands
+{
+ public class DataStructureTypes
+ {
+ public const byte ErrorType = 0;
+
+ public const byte MessageType = 1;
+ public const byte BytesMessageType = 2;
+ public const byte MapMessageType = 3;
+ public const byte StreamMessageType = 4;
+ public const byte TextMessageType = 5;
+
+ public const byte MessageDispatchType = 9;
+ public const byte MessageIdType = 10;
+ public const byte MessageAckType = 11;
+
+ public const byte ConnectionInfoType = 12;
+ public const byte ConnectionIdType = 13;
+ public const byte ConsumerInfoType = 14;
+ public const byte ConsumerIdType = 15;
+ public const byte ProducerInfoType = 16;
+ public const byte ProducerIdType = 17;
+ public const byte SessionInfoType = 18;
+ public const byte SessionIdType = 19;
+ public const byte TransactionInfoType = 20;
+ public const byte TransactionIdType = 21;
+ public const byte SubscriptionInfoType = 22;
+ public const byte ShutdownInfoType = 23;
+ public const byte ResponseType = 24;
+ public const byte RemoveInfoType = 25;
+ public const byte ErrorResponseType = 26;
+
+ public const byte DestinationType = 48;
+ public const byte TempDestinationType = 49;
+ public const byte TopicType = 50;
+ public const byte TempTopicType = 51;
+ public const byte QueueType = 52;
+ public const byte TempQueueType = 53;
+
+ public static String GetDataStructureTypeAsString(int type)
+ {
+ String packetTypeStr = "UnknownType";
+ switch(type)
+ {
+ case ErrorType:
+ packetTypeStr = "ErrorType";
+ break;
+ case MessageType:
+ packetTypeStr = "MessageType";
+ break;
+ case BytesMessageType:
+ packetTypeStr = "BytesMessageType";
+ break;
+ case StreamMessageType:
+ packetTypeStr = "StreamMessageType";
+ break;
+ case TextMessageType:
+ packetTypeStr = "TextMessageType";
+ break;
+ case MessageDispatchType:
+ packetTypeStr = "MessageDispatchType";
+ break;
+ case MessageIdType:
+ packetTypeStr = "MessageIdType";
+ break;
+ case MessageAckType:
+ packetTypeStr = "MessageAckType";
+ break;
+ case ConnectionInfoType:
+ packetTypeStr = "ConnectionInfoType";
+ break;
+ case ConnectionIdType:
+ packetTypeStr = "ConnectionIdType";
+ break;
+ case ConsumerInfoType:
+ packetTypeStr = "ConsumerInfoType";
+ break;
+ case ConsumerIdType:
+ packetTypeStr = "ConsumerIdType";
+ break;
+ case ProducerInfoType:
+ packetTypeStr = "ProducerInfoType";
+ break;
+ case ProducerIdType:
+ packetTypeStr = "ProducerIdType";
+ break;
+ case SessionInfoType:
+ packetTypeStr = "SessionInfoType";
+ break;
+ case TransactionInfoType:
+ packetTypeStr = "TransactionInfoType";
+ break;
+ case TransactionIdType:
+ packetTypeStr = "TransactionIdType";
+ break;
+ case SubscriptionInfoType:
+ packetTypeStr = "SubscriptionInfoType";
+ break;
+ case ShutdownInfoType:
+ packetTypeStr = "ShutdownInfoType";
+ break;
+ case ResponseType:
+ packetTypeStr = "ResponseType";
+ break;
+ case RemoveInfoType:
+ packetTypeStr = "RemoveInfoType";
+ break;
+ case ErrorResponseType:
+ packetTypeStr = "ErrorResponseType";
+ break;
+ case DestinationType:
+ packetTypeStr = "DestinationType";
+ break;
+ case TempDestinationType:
+ packetTypeStr = "TempDestinationType";
+ break;
+ case TopicType:
+ packetTypeStr = "TopicType";
+ break;
+ case TempTopicType:
+ packetTypeStr = "TempTopicType";
+ break;
+ case QueueType:
+ packetTypeStr = "QueueType";
+ break;
+ case TempQueueType:
+ packetTypeStr = "TempQueueType";
+ break;
+ }
+
+ return packetTypeStr;
+ }
+ }
+}

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/DataStructureTypes.cs
------------------------------------------------------------------------------
svn:eol-style = native

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs Fri Dec 4 22:53:41 2009
@@ -42,27 +42,6 @@
/// Temporary Queue Destination object
/// </summary>
public const int STOMP_TEMPORARY_QUEUE = 4;
- /// <summary>
- /// prefix for Advisory message destinations
- /// </summary>
- public const String ADVISORY_PREFIX = "ActiveMQ.Advisory.";
- /// <summary>
- /// prefix for consumer advisory destinations
- /// </summary>
- public const String CONSUMER_ADVISORY_PREFIX = ADVISORY_PREFIX + "Consumers.";
- /// <summary>
- /// prefix for producer advisory destinations
- /// </summary>
- public const String PRODUCER_ADVISORY_PREFIX = ADVISORY_PREFIX + "Producers.";
- /// <summary>
- /// prefix for connection advisory destinations
- /// </summary>
- public const String CONNECTION_ADVISORY_PREFIX = ADVISORY_PREFIX + "Connections.";
-
- /// <summary>
- /// The default target for ordered destinations
- /// </summary>
- public const String DEFAULT_ORDERED_TARGET = "coordinator";

private const String TEMP_PREFIX = "{TD{";
private const String TEMP_POSTFIX = "}TD}";
@@ -71,12 +50,6 @@
private String physicalName = "";
private StringDictionary options = null;

- // Cached transient data
- private bool exclusive;
- private bool ordered;
- private bool advisory;
- private String orderedTarget = DEFAULT_ORDERED_TARGET;
-
/// <summary>
/// The Default Constructor
/// </summary>
@@ -91,7 +64,6 @@
protected Destination(String name)
{
setPhysicalName(name);
- //this.advisory = name != null && name.StartsWith(ADVISORY_PREFIX);
}

public bool IsTopic
@@ -148,94 +120,6 @@
}

/// <summary>
- /// </summary>
- /// <returns>Returns the advisory.</returns>
- public bool IsAdvisory()
- {
- return advisory;
- }
-
- /// <summary>
- /// </summary>
- /// <param name="advisory">The advisory to set.</param>
- public void SetAdvisory(bool advisory)
- {
- this.advisory = advisory;
- }
-
- /// <summary>
- /// </summary>
- /// <returns>true if this is a destination for Consumer advisories</returns>
- public bool IsConsumerAdvisory()
- {
- return IsAdvisory() && physicalName.StartsWith(CONSUMER_ADVISORY_PREFIX);
- }
-
- /// <summary>
- /// </summary>
- /// <returns>true if this is a destination for Producer advisories</returns>
- public bool IsProducerAdvisory()
- {
- return IsAdvisory() && physicalName.StartsWith(PRODUCER_ADVISORY_PREFIX);
- }
-
- /// <summary>
- /// </summary>
- /// <returns>true if this is a destination for Connection advisories</returns>
- public bool IsConnectionAdvisory()
- {
- return IsAdvisory() && physicalName.StartsWith(CONNECTION_ADVISORY_PREFIX);
- }
-
- /// <summary>
- /// </summary>
- /// <returns>Returns the exclusive.</returns>
- public bool IsExclusive()
- {
- return exclusive;
- }
-
- /// <summary>
- /// </summary>
- /// <param name="exclusive">The exclusive to set.</param>
- public void SetExclusive(bool exclusive)
- {
- this.exclusive = exclusive;
- }
-
- /// <summary>
- /// </summary>
- /// <returns>Returns the ordered.</returns>
- public bool IsOrdered()
- {
- return ordered;
- }
-
- /// <summary>
- /// </summary>
- /// <param name="ordered">The ordered to set.</param>
- public void SetOrdered(bool ordered)
- {
- this.ordered = ordered;
- }
-
- /// <summary>
- /// </summary>
- /// <returns>Returns the orderedTarget.</returns>
- public String GetOrderedTarget()
- {
- return orderedTarget;
- }
-
- /// <summary>
- /// </summary>
- /// <param name="orderedTarget">The orderedTarget to set.</param>
- public void SetOrderedTarget(String orderedTarget)
- {
- this.orderedTarget = orderedTarget;
- }
-
- /// <summary>
/// A helper method to return a descriptive string for the topic or queue
/// </summary>
/// <param name="destination"></param>
@@ -269,19 +153,19 @@
{
if(destination is ITemporaryQueue)
{
- result = new ActiveMQTempQueue(((IQueue) destination).QueueName);
+ result = new TempQueue(((IQueue) destination).QueueName);
}
else if(destination is ITemporaryTopic)
{
- result = new ActiveMQTempTopic(((ITopic) destination).TopicName);
+ result = new TempTopic(((ITopic) destination).TopicName);
}
else if(destination is IQueue)
{
- result = new ActiveMQQueue(((IQueue) destination).QueueName);
+ result = new Queue(((IQueue) destination).QueueName);
}
else if(destination is ITopic)
{
- result = new ActiveMQTopic(((ITopic) destination).TopicName);
+ result = new Topic(((ITopic) destination).TopicName);
}
}
}

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ExceptionResponse.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ExceptionResponse.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ExceptionResponse.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ExceptionResponse.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class ExceptionResponse : Response
{
- public const byte ID_EXCEPTIONRESPONSE = 31;
-
BrokerError exception;

///
@@ -34,7 +32,7 @@
///
public override byte GetDataStructureType()
{
- return ID_EXCEPTIONRESPONSE;
+ return DataStructureTypes.ErrorResponseType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs Fri Dec 4 22:53:41 2009
@@ -25,14 +25,12 @@
{
public class MapMessage : Message, IMapMessage
{
- public const byte ID_ACTIVEMQMAPMESSAGE = 25;
-
private PrimitiveMap body;
private PrimitiveMapInterceptor typeConverter;

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQMAPMESSAGE;
+ return DataStructureTypes.MapMessageType;
}

public override void ClearBody()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs Fri Dec 4 22:53:41 2009
@@ -22,12 +22,10 @@

namespace Apache.NMS.Stomp.Commands
{
- public delegate void AcknowledgeHandler(ActiveMQMessage message);
+ public delegate void AcknowledgeHandler(Message message);

public class Message : BaseMessage, IMessage, MarshallAware
{
- public const byte ID_ACTIVEMQMESSAGE = 23;
-
private MessagePropertyIntercepter propertyHelper;
private PrimitiveMap properties;
private Connection connection;
@@ -44,6 +42,11 @@
Timestamp = DateUtils.ToJavaTimeUtc(DateTime.UtcNow);
}

+ public override byte GetDataStructureType()
+ {
+ return DataStructureTypes.MessageType;
+ }
+
public override int GetHashCode()
{
MessageId id = this.MessageId;
@@ -58,11 +61,6 @@
}
}

- public override byte GetDataStructureType()
- {
- return ID_ACTIVEMQMESSAGE;
- }
-
public override bool Equals(object that)
{
if(that is Message)

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageAck.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageAck.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageAck.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageAck.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class MessageAck : BaseCommand
{
- public const byte ID_MESSAGEACK = 22;
-
Destination destination;
TransactionId transactionId;
ConsumerId consumerId;
@@ -40,7 +38,7 @@
///
public override byte GetDataStructureType()
{
- return ID_MESSAGEACK;
+ return DataStructureTypes.MessageAckType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageDispatch.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageDispatch.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageDispatch.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageDispatch.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class MessageDispatch : BaseCommand
{
- public const byte ID_MESSAGEDISPATCH = 21;
-
ConsumerId consumerId;
Destination destination;
Message message;
@@ -31,6 +29,17 @@

///
/// <summery>
+ /// Get the unique identifier that this object and its own
+ /// Marshaler share.
+ /// </summery>
+ ///
+ public override byte GetDataStructureType()
+ {
+ return DataStructureTypes.MessageDispatchType;
+ }
+
+ ///
+ /// <summery>
/// Returns a string containing the information for this DataStructure
/// such as its type and value of its elements.
/// </summery>

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageId.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageId.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MessageId.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class MessageId : BaseDataStructure
{
- public const byte ID_MESSAGEID = 110;
-
ProducerId producerId;
long producerSequenceId;
long brokerSequenceId;
@@ -53,7 +51,7 @@
///
public override byte GetDataStructureType()
{
- return ID_MESSAGEID;
+ return DataStructureTypes.MessageIdType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerId.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerId.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerId.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class ProducerId : BaseDataStructure
{
- public const byte ID_PRODUCERID = 123;
-
private SessionId parentId;

string connectionId;
@@ -60,7 +58,7 @@
///
public override byte GetDataStructureType()
{
- return ID_PRODUCERID;
+ return DataStructureTypes.ProducerIdType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ProducerInfo.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class ProducerInfo : BaseCommand
{
- public const byte ID_PRODUCERINFO = 6;
-
ProducerId producerId;
Destination destination;
bool dispatchAsync;
@@ -37,7 +35,7 @@
///
public override byte GetDataStructureType()
{
- return ID_PRODUCERINFO;
+ return DataStructureTypes.ProducerInfoType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Queue.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Queue.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Queue.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Queue.cs Fri Dec 4 22:53:41 2009
@@ -23,8 +23,6 @@
/// </summary>
public class Queue : Destination, IQueue
{
- public const byte ID_ACTIVEMQQUEUE = 100;
-
public Queue()
: base()
{
@@ -50,7 +48,7 @@

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQQUEUE;
+ return DataStructureTypes.QueueType;
}

public override int GetDestinationType()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/RemoveInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/RemoveInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/RemoveInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/RemoveInfo.cs Fri Dec 4 22:53:41 2009
@@ -18,30 +18,15 @@
using System;
using System.Collections;

-using Apache.NMS.ActiveMQ.State;
-
namespace Apache.NMS.Stomp.Commands
{
public class RemoveInfo : BaseCommand
{
- public const byte ID_REMOVEINFO = 12;
-
DataStructure objectId;
long lastDeliveredSequenceId;

///
/// <summery>
- /// Get the unique identifier that this object and its own
- /// Marshaler share.
- /// </summery>
- ///
- public override byte GetDataStructureType()
- {
- return ID_REMOVEINFO;
- }
-
- ///
- /// <summery>
/// Returns a string containing the information for this DataStructure
/// such as its type and value of its elements.
/// </summery>
@@ -54,6 +39,11 @@
"]";
}

+ public override byte GetDataStructureType()
+ {
+ return DataStructureTypes.RemoveInfoType;
+ }
+
public DataStructure ObjectId
{
get { return objectId; }

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Response.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Response.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Response.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Response.cs Fri Dec 4 22:53:41 2009
@@ -25,6 +25,11 @@
{
int correlationId;

+ public override byte GetDataStructureType()
+ {
+ return DataStructureTypes.ResponseType;
+ }
+
///
/// <summery>
/// Returns a string containing the information for this DataStructure

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionId.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionId.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionId.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class SessionId : BaseDataStructure
{
- public const byte ID_SESSIONID = 121;
-
private ConnectionId parentId;

string connectionId;
@@ -59,7 +57,7 @@
///
public override byte GetDataStructureType()
{
- return ID_SESSIONID;
+ return DataStructureTypes.SessionIdType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SessionInfo.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class SessionInfo : BaseCommand
{
- public const byte ID_SESSIONINFO = 4;
-
SessionId sessionId;

public SessionInfo()
@@ -43,7 +41,7 @@
///
public override byte GetDataStructureType()
{
- return ID_SESSIONINFO;
+ return DataStructureTypes.SessionInfoType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ShutdownInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ShutdownInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ShutdownInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/ShutdownInfo.cs Fri Dec 4 22:53:41 2009
@@ -20,19 +20,8 @@

namespace Apache.NMS.Stomp.Commands
{
- /*
- *
- * Command code for OpenWire format for ShutdownInfo
- *
- * NOTE!: This file is auto generated - do not modify!
- * if you need to make a change, please see the Java Classes
- * in the nms-activemq-openwire-generator module
- *
- */
public class ShutdownInfo : BaseCommand
{
- public const byte ID_SHUTDOWNINFO = 11;
-
///
/// <summery>
/// Get the unique identifier that this object and its own
@@ -41,7 +30,7 @@
///
public override byte GetDataStructureType()
{
- return ID_SHUTDOWNINFO;
+ return DataStructureTypes.ShutdownInfoType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/StreamMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/StreamMessage.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/StreamMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/StreamMessage.cs Fri Dec 4 22:53:41 2009
@@ -32,11 +32,9 @@
private MemoryStream byteBuffer = null;
private int bytesRemaining = -1;

- public const byte ID_ACTIVEMQSTREAMMESSAGE = 27;
-
public override byte GetDataStructureType()
{
- return ID_ACTIVEMQSTREAMMESSAGE;
+ return DataStructureTypes.StreamMessageType;
}

public bool ReadBoolean()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SubscriptionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SubscriptionInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SubscriptionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/SubscriptionInfo.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class SubscriptionInfo : BaseDataStructure
{
- public const byte ID_SUBSCRIPTIONINFO = 55;
-
string clientId;
Destination destination;
string selector;
@@ -38,7 +36,7 @@
///
public override byte GetDataStructureType()
{
- return ID_SUBSCRIPTIONINFO;
+ return DataStructureTypes.SubscriptionInfoType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempDestination.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempDestination.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempDestination.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempDestination.cs Fri Dec 4 22:53:41 2009
@@ -28,8 +28,7 @@
/// <returns>An int</returns>
public override int GetDestinationType()
{
- // TODO: Implement this method
- return 0;
+ return DataStructureTypes.TempDestinationType;
}

/// <summary>

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs Fri Dec 4 22:53:41 2009
@@ -23,8 +23,6 @@
/// </summary>
public class TempQueue : TempDestination, ITemporaryQueue
{
- public const byte ID_ACTIVEMQTEMPQUEUE = 102;
-
public TempQueue()
: base()
{
@@ -50,7 +48,7 @@

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQTEMPQUEUE;
+ return DataStructureTypes.TempQueueType;
}

public override int GetDestinationType()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs Fri Dec 4 22:53:41 2009
@@ -24,8 +24,6 @@
/// </summary>
public class TempTopic : TempDestination, ITemporaryTopic
{
- public const byte ID_ACTIVEMQTEMPTOPIC = 103;
-
public TempTopic()
: base()
{
@@ -52,7 +50,7 @@

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQTEMPTOPIC;
+ return DataStructureTypes.TempTopicType;
}

public override int GetDestinationType()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TextMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TextMessage.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TextMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TextMessage.cs Fri Dec 4 22:53:41 2009
@@ -26,8 +26,6 @@
{
public class TextMessage : Message, ITextMessage
{
- public const byte ID_ACTIVEMQTEXTMESSAGE = 28;
-
private String text = null;

public TextMessage()
@@ -58,7 +56,7 @@

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQTEXTMESSAGE;
+ return DataStructureTypes.TextMessageType;
}

// Properties

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs Fri Dec 4 22:53:41 2009
@@ -24,8 +24,6 @@
/// </summary>
public class StompTopic : Destination, ITopic
{
- public const byte ID_ACTIVEMQTOPIC = 101;
-
public StompTopic() : base()
{
}
@@ -49,7 +47,7 @@

public override byte GetDataStructureType()
{
- return ID_ACTIVEMQTOPIC;
+ return DataStructureTypes.TopicType;
}

public override int GetDestinationType()

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs Fri Dec 4 22:53:41 2009
@@ -22,8 +22,6 @@
{
public class TransactionId
{
- public const byte ID_TRANSACTIONID = 111;
-
long value;
ConnectionId connectionId;

@@ -35,7 +33,7 @@
///
public byte GetDataStructureType()
{
- return ID_LOCALTRANSACTIONID;
+ return DataStructureTypes.TransactionIdType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionInfo.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionInfo.cs Fri Dec 4 22:53:41 2009
@@ -22,11 +22,9 @@
{
public class TransactionInfo : BaseCommand
{
- public const byte ID_TRANSACTIONINFO = 7;
-
public const byte BEGIN = 0;
- public const byte ROLLBACK = 1;
- public const byte COMMIT = 2;
+ public const byte COMMIT = 1;
+ public const byte ROLLBACK = 2;

ConnectionId connectionId;
TransactionId transactionId;
@@ -40,7 +38,7 @@
///
public override byte GetDataStructureType()
{
- return ID_TRANSACTIONINFO;
+ return DataStructureTypes.TransactionInfoType;
}

///

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs Fri Dec 4 22:53:41 2009
@@ -656,9 +656,9 @@
/// <summary>
/// Creates a new local transaction ID
/// </summary>
- public LocalTransactionId CreateLocalTransactionId()
+ public TransactionId CreateLocalTransactionId()
{
- LocalTransactionId id = new LocalTransactionId();
+ TransactionId id = new TransactionId();
id.ConnectionId = ConnectionId;
id.Value = Interlocked.Increment(ref localTransactionCounter);
return id;

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/IDispatcher.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/IDispatcher.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/IDispatcher.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/IDispatcher.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Apache.NMS.Stomp.Commands;
+
+namespace Apache.NMS.Stomp
+{
+ /// <summary>
+ /// Interface that provides for a Class to provide dispatching service for
+ /// an OpenWire MessageDispatch command.
+ /// </summary>
+ public interface IDispatcher
+ {
+ void Dispatch(MessageDispatch messageDispatch);
+ }
+}

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/IDispatcher.cs
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/ISynchronization.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/ISynchronization.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/ISynchronization.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/ISynchronization.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.NMS.Stomp
+{
+ public interface ISynchronization
+ {
+ /// <summary>
+ /// Called before a commit or rollback is applied.
+ /// </summary>
+ void BeforeEnd();
+
+ /// <summary>
+ /// Called after a commit
+ /// </summary>
+ void AfterCommit();
+
+ /// <summary>
+ /// Called after a transaction rollback
+ /// </summary>
+ void AfterRollback();
+ }
+}
+

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/ISynchronization.cs
------------------------------------------------------------------------------
svn:eol-style = native

svn commit: r887420 [3/3] - in /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk: ./ src/main/csharp/ src/main/csharp/Commands/ src/main/csharp/Threads/

2009-12-04T14:53:42Z

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Threading;
+
+namespace Apache.NMS.Stomp.Threads
+{
+ /// <summary>
+ /// A TaskRunner that dedicates a single thread to running a single Task.
+ /// </summary>
+ public class DedicatedTaskRunner : TaskRunner
+ {
+ private readonly Mutex mutex = new Mutex();
+ private Thread theThread = null;
+ private Task task = null;
+
+ private bool terminated = false;
+ private bool pending = false;
+ private bool shutdown = false;
+
+ public DedicatedTaskRunner(Task task)
+ {
+ if(task == null)
+ {
+ throw new NullReferenceException("Task was null");
+ }
+
+ this.task = task;
+
+ this.theThread = new Thread(Run);
+ this.theThread.IsBackground = true;
+ this.theThread.Start();
+ }
+
+ public void Shutdown(TimeSpan timeout)
+ {
+ lock(mutex)
+ {
+ this.shutdown = true;
+ this.pending = true;
+
+ Monitor.PulseAll(this.mutex);
+
+ // Wait till the thread stops ( no need to wait if shutdown
+ // is called from thread that is shutting down)
+ if(Thread.CurrentThread != this.theThread && !this.terminated)
+ {
+ Monitor.Wait(this.mutex, timeout);
+ }
+ }
+ }
+
+ public void Shutdown()
+ {
+ this.Shutdown(TimeSpan.FromMilliseconds(-1));
+ }
+
+ public void Wakeup()
+ {
+ lock(mutex)
+ {
+ if(this.shutdown)
+ {
+ return;
+ }
+
+ this.pending = true;
+
+ Monitor.PulseAll(this.mutex);
+ }
+ }
+
+ internal void Run()
+ {
+ try
+ {
+ while(true)
+ {
+ lock(this.mutex)
+ {
+ pending = false;
+
+ if(this.shutdown)
+ {
+
+ return;
+ }
+ }
+
+ if(!this.task.Iterate())
+ {
+ // wait to be notified.
+ lock(this.mutex)
+ {
+ if(this.shutdown)
+ {
+ return;
+ }
+
+ while(!this.pending)
+ {
+ Monitor.Wait(this.mutex);
+ }
+ }
+ }
+ }
+ }
+ catch
+ {
+ }
+ finally
+ {
+ // Make sure we notify any waiting threads that thread
+ // has terminated.
+ lock(this.mutex)
+ {
+ this.terminated = true;
+ Monitor.PulseAll(this.mutex);
+ }
+ }
+ }
+ }
+}

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/Task.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/Task.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/Task.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/Task.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.NMS.Stomp.Threads
+{
+ /// <summary>
+ /// Represents a task that may take a few iterations to complete.
+ /// </summary>
+ public interface Task
+ {
+ bool Iterate();
+ }
+}

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/Task.cs
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunner.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunner.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunner.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunner.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Apache.NMS.Stomp.Threads
+{
+ /// <summary>
+ /// Allows you to request a thread execute the associated Task.
+ /// </summary>
+ public interface TaskRunner
+ {
+ void Wakeup();
+ void Shutdown();
+ void Shutdown(TimeSpan timeout);
+ }
+}

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunner.cs
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunnerFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunnerFactory.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunnerFactory.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunnerFactory.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Threading;
+
+namespace Apache.NMS.Stomp.Threads
+{
+ /// <summary>
+ /// Manages the thread pool for long running tasks. Long running tasks are not
+ /// always active but when they are active, they may need a few iterations of
+ /// processing for them to become idle. The manager ensures that each task is
+ /// processes but that no one task overtakes the system. This is kina like
+ /// cooperative multitasking.
+ /// </summary>
+ public class TaskRunnerFactory
+ {
+ protected int maxIterationsPerRun;
+ protected String name;
+ protected ThreadPriority priority;
+ protected bool daemon;
+
+ public TaskRunnerFactory()
+ {
+ InitTaskRunnerFactory("ActiveMQ Task", ThreadPriority.Normal, true, 1000, false);
+ }
+
+ public TaskRunnerFactory(String name, ThreadPriority priority, bool daemon, int maxIterationsPerRun)
+ {
+ InitTaskRunnerFactory(name, priority, daemon, maxIterationsPerRun, false);
+ }
+
+ public TaskRunnerFactory(String name, ThreadPriority priority, bool daemon, int maxIterationsPerRun, bool dedicatedTaskRunner)
+ {
+ InitTaskRunnerFactory(name, priority, daemon, maxIterationsPerRun, dedicatedTaskRunner);
+ }
+
+ public void InitTaskRunnerFactory(String name, ThreadPriority priority, bool daemon, int maxIterationsPerRun, bool dedicatedTaskRunner)
+ {
+ this.name = name;
+ this.priority = priority;
+ this.daemon = daemon;
+ this.maxIterationsPerRun = maxIterationsPerRun;
+
+ // If your OS/JVM combination has a good thread model, you may want to avoid
+ // using a thread pool to run tasks and use a DedicatedTaskRunner instead.
+ }
+
+ public void Shutdown()
+ {
+ }
+
+ public TaskRunner CreateTaskRunner(Task task, String name)
+ {
+ return new PooledTaskRunner(task, maxIterationsPerRun);
+ }
+ }
+}

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/TaskRunnerFactory.cs
------------------------------------------------------------------------------
svn:eol-style = native

Added: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/TransactionContext.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/TransactionContext.cs?rev=887420&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/TransactionContext.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/TransactionContext.cs Fri Dec 4 22:53:41 2009
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using Apache.NMS.Stomp;
+using Apache.NMS.Stomp.Commands;
+using System.Collections;
+
+namespace Apache.NMS.Stomp
+{
+ public enum TransactionType
+ {
+ Begin = 0, Commit = 1, Rollback = 2
+ }
+}
+
+namespace Apache.NMS.Stomp
+{
+ public class TransactionContext
+ {
+ private TransactionId transactionId;
+ private Session session;
+ private ArrayList synchronizations = ArrayList.Synchronized(new ArrayList());
+
+ public TransactionContext(Session session)
+ {
+ this.session = session;
+ }
+
+ public bool InTransaction
+ {
+ get{ return this.transactionId != null; }
+ }
+
+ public TransactionId TransactionId
+ {
+ get { return transactionId; }
+ }
+
+ /// <summary>
+ /// Method AddSynchronization
+ /// </summary>
+ public void AddSynchronization(ISynchronization synchronization)
+ {
+ synchronizations.Add(synchronization);
+ }
+
+ public void RemoveSynchronization(ISynchronization synchronization)
+ {
+ synchronizations.Remove(synchronization);
+ }
+
+ public void Begin()
+ {
+ if(!InTransaction)
+ {
+ this.transactionId = this.session.Connection.CreateLocalTransactionId();
+
+ TransactionInfo info = new TransactionInfo();
+ info.ConnectionId = this.session.Connection.ConnectionId;
+ info.TransactionId = transactionId;
+ info.Type = (int) TransactionType.Begin;
+
+ this.session.Connection.Oneway(info);
+ }
+ }
+
+ public void Rollback()
+ {
+ if(!InTransaction)
+ {
+ throw new NMSException("Invliad State: Not Currently in a Transaction");
+ }
+
+ this.BeforeEnd();
+
+ TransactionInfo info = new TransactionInfo();
+ info.ConnectionId = this.session.Connection.ConnectionId;
+ info.TransactionId = transactionId;
+ info.Type = (int) TransactionType.Rollback;
+
+ this.transactionId = null;
+ this.session.Connection.SyncRequest(info);
+
+ this.AfterRollback();
+ this.synchronizations.Clear();
+ }
+
+ public void Commit()
+ {
+ if(!InTransaction)
+ {
+ throw new NMSException("Invliad State: Not Currently in a Transaction");
+ }
+
+ this.BeforeEnd();
+
+ TransactionInfo info = new TransactionInfo();
+ info.ConnectionId = this.session.Connection.ConnectionId;
+ info.TransactionId = transactionId;
+ info.Type = (int) TransactionType.CommitOnePhase;
+
+ this.transactionId = null;
+ this.session.Connection.SyncRequest(info);
+
+ this.AfterCommit();
+ this.synchronizations.Clear();
+ }
+
+ internal void BeforeEnd()
+ {
+ lock(this.synchronizations.SyncRoot)
+ {
+ foreach(ISynchronization synchronization in this.synchronizations)
+ {
+ synchronization.BeforeEnd();
+ }
+ }
+ }
+
+ internal void AfterCommit()
+ {
+ lock(this.synchronizations.SyncRoot)
+ {
+ foreach(ISynchronization synchronization in this.synchronizations)
+ {
+ synchronization.AfterCommit();
+ }
+ }
+ }
+
+ internal void AfterRollback()
+ {
+ lock(this.synchronizations.SyncRoot)
+ {
+ foreach(ISynchronization synchronization in this.synchronizations)
+ {
+ synchronization.AfterRollback();
+ }
+ }
+ }
+ }
+}
+

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/TransactionContext.cs
------------------------------------------------------------------------------
svn:eol-style = native

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/vs2008-stomp.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/vs2008-stomp.csproj?rev=887420&r1=887419&r2=887420&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/vs2008-stomp.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/vs2008-stomp.csproj Fri Dec 4 22:53:41 2009
@@ -93,6 +93,19 @@
<Compile Include="src\main\csharp\ConnectionMetaData.cs" />
<Compile Include="src\main\csharp\Commands\MessageDispatch.cs" />
<Compile Include="src\main\csharp\Commands\ShutdownInfo.cs" />
+ <Compile Include="src\main\csharp\IDispatcher.cs" />
+ <Compile Include="src\main\csharp\ISynchronization.cs" />
+ <Compile Include="src\main\csharp\MessageConsumer.cs" />
+ <Compile Include="src\main\csharp\MessageProducer.cs" />
+ <Compile Include="src\main\csharp\PrefetchPolicy.cs" />
+ <Compile Include="src\main\csharp\Session.cs" />
+ <Compile Include="src\main\csharp\SessionExecutor.cs" />
+ <Compile Include="src\main\csharp\TransactionContext.cs" />
+ <Compile Include="src\main\csharp\Threads\DedicatedTaskRunner.cs" />
+ <Compile Include="src\main\csharp\Threads\Task.cs" />
+ <Compile Include="src\main\csharp\Threads\TaskRunner.cs" />
+ <Compile Include="src\main\csharp\Threads\TaskRunnerFactory.cs" />
+ <Compile Include="src\main\csharp\Commands\DataStructureTypes.cs" />
</ItemGroup>
<ItemGroup>
<None Include="keyfile\NMSKey.snk" />