Author: fhanik
Date: Thu Mar 2 11:36:28 2006
New Revision: 382480
URL: http://svn.apache.org/viewcvs?rev=382480&view=rev
Log:
Refactored into two packages, one for NIO and one for Blocking IO (bio)
Added:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
- copied, changed from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/FastAsyncSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledSocketSender.java
- copied, changed from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
- copied, changed from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/SinglePointDataSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioSender.java
- copied, changed from r382472,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
- copied, changed from r382472,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java
- copied, changed from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/FastAsyncSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/SinglePointDataSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSenders.properties
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSenders.properties
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSenders.properties?rev=382480&r1=382479&r2=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSenders.properties
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSenders.properties
Thu Mar 2 11:36:28 2006
@@ -1,4 +1,4 @@
-fastasyncqueue=org.apache.catalina.tribes.tcp.FastAsyncSocketSender
-synchronous=org.apache.catalina.tribes.tcp.SocketSender
-pooled=org.apache.catalina.tribes.tcp.PooledSocketSender
-parallel=org.apache.catalina.tribes.tcp.PooledNioSender
\ No newline at end of file
+fastasyncqueue=org.apache.catalina.tribes.tcp.bio.FastAsyncSocketSender
+synchronous=org.apache.catalina.tribes.tcp.bio.SocketSender
+pooled=org.apache.catalina.tribes.tcp.bio.PooledSocketSender
+parallel=org.apache.catalina.tribes.tcp.nio.PooledNioSender
\ No newline at end of file
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java?rev=382480&r1=382479&r2=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
Thu Mar 2 11:36:28 2006
@@ -33,6 +33,7 @@
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.util.StringManager;
+import org.apache.catalina.tribes.tcp.nio.*;
/**
* @author Filip Hanik
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java?rev=382480&r1=382479&r2=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java
Thu Mar 2 11:36:28 2006
@@ -35,7 +35,7 @@
Object mutex = new Object();
Object interestOpsMutex = null;
- ThreadPool (Object interestOpsMutex, WorkerThread[] threads) throws
Exception {
+ public ThreadPool (Object interestOpsMutex, WorkerThread[] threads) throws
Exception {
// fill up the pool with worker threads
this.interestOpsMutex = interestOpsMutex;
for (int i = 0; i < threads.length; i++) {
@@ -50,7 +50,7 @@
}
- ThreadPool (int poolSize, Class threadClass, Object interestOpsMutex, int
threadOptions) throws Exception {
+ public ThreadPool (int poolSize, Class threadClass, Object
interestOpsMutex, int threadOptions) throws Exception {
// fill up the pool with worker threads
this.interestOpsMutex = interestOpsMutex;
for (int i = 0; i < poolSize; i++) {
@@ -70,7 +70,7 @@
/**
* Find an idle worker thread, if any. Could return null.
*/
- WorkerThread getWorker()
+ public WorkerThread getWorker()
{
WorkerThread worker = null;
@@ -97,8 +97,7 @@
* Called by the worker thread to return itself to the
* idle pool.
*/
- void returnWorker (WorkerThread worker)
- {
+ public void returnWorker (WorkerThread worker) {
synchronized (mutex) {
idle.add (worker);
mutex.notify();
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
(from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/FastAsyncSocketSender.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/FastAsyncSocketSender.java&r1=382476&r2=382480&rev=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/FastAsyncSocketSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
Thu Mar 2 11:36:28 2006
@@ -14,7 +14,7 @@
* the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.bio;
import java.net.InetAddress;
@@ -23,6 +23,7 @@
import org.apache.catalina.tribes.util.IQueue;
import org.apache.catalina.tribes.util.LinkObject;
import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.catalina.tribes.tcp.*;
/**
* Send cluster messages from a Message queue with only one socket. Ack and
keep
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledSocketSender.java
(from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledSocketSender.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledSocketSender.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java&r1=382476&r2=382480&rev=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledSocketSender.java
Thu Mar 2 11:36:28 2006
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.bio;
import java.io.IOException;
import java.net.InetAddress;
import java.util.LinkedList;
import org.apache.catalina.tribes.ChannelMessage;
+import org.apache.catalina.tribes.tcp.*;
/**
* Send cluster messages with a pool of sockets (25).
@@ -34,7 +35,7 @@
public class PooledSocketSender extends SinglePointDataSender {
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
- .getLog(org.apache.catalina.tribes.tcp.PooledSocketSender.class);
+
.getLog(org.apache.catalina.tribes.tcp.bio.PooledSocketSender.class);
/**
* The descriptive information about this implementation.
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
(from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/SinglePointDataSender.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/SinglePointDataSender.java&r1=382476&r2=382480&rev=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/SinglePointDataSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
Thu Mar 2 11:36:28 2006
@@ -14,7 +14,7 @@
* the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.bio;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,6 +27,7 @@
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.util.StringManager;
import java.util.Arrays;
+import org.apache.catalina.tribes.tcp.*;
/**
* Send cluster messages with only one socket. Ack and keep Alive Handling is
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioSender.java
(from r382472,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioSender.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioSender.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java&r1=382472&r2=382480&rev=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioSender.java
Thu Mar 2 11:36:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.nio;
import java.io.IOException;
import java.net.InetAddress;
@@ -137,7 +137,7 @@
ackbuf.append(readbuf,read);
readbuf.clear();
if (ackbuf.doesPackageExist() ) {
- return
Arrays.equals(ackbuf.extractDataPackage(true),Constants.ACK_DATA);
+ return
Arrays.equals(ackbuf.extractDataPackage(true),org.apache.catalina.tribes.tcp.Constants.ACK_DATA);
} else {
return false;
}
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
(from r382472,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java&r1=382472&r2=382480&rev=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
Thu Mar 2 11:36:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.nio;
import java.io.IOException;
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java
(from r382476,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java&r1=382476&r2=382480&rev=382480&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java
Thu Mar 2 11:36:28 2006
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import org.apache.catalina.tribes.io.ObjectReader;
+import org.apache.catalina.tribes.tcp.*;
/**
* A worker thread class which can drain channels and echo-back the input. Each
@@ -47,7 +48,7 @@
private ByteBuffer buffer = null;
private SelectionKey key;
private int rxBufSize;
- TcpReplicationThread ()
+ public TcpReplicationThread ()
{
}
@@ -111,8 +112,7 @@
* to ignore read-readiness for this channel while the
* worker thread is servicing it.
*/
- synchronized void serviceChannel (SelectionKey key)
- {
+ public synchronized void serviceChannel (SelectionKey key) {
this.key = key;
key.interestOps (key.interestOps() & (~SelectionKey.OP_READ));
key.interestOps (key.interestOps() & (~SelectionKey.OP_WRITE));
@@ -127,9 +127,7 @@
* re-enables OP_READ and calls wakeup() on the selector
* so the selector will resume watching this channel.
*/
- protected void drainChannel (SelectionKey key)
- throws Exception
- {
+ protected void drainChannel (SelectionKey key) throws Exception {
SocketChannel channel = (SocketChannel) key.channel();
int count;
buffer.clear(); // make buffer empty
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
