You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2006/12/15 01:30:54 UTC
svn commit: r487409 - in
/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport:
bio/BioReceiver.java bio/BioReplicationTask.java
bio/BioReplicationThread.java nio/NioReceiver.java
nio/NioReplicationTask.java nio/NioReplicationThread.java
Author: fhanik
Date: Thu Dec 14 16:30:53 2006
New Revision: 487409
URL: http://svn.apache.org/viewvc?view=rev&rev=487409
Log:
Name change in preparation of pluggable Executors and thread fairness
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
- copied, changed from r487408, tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
- copied, changed from r487408, tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
Removed:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?view=diff&rev=487409&r1=487408&r2=487409
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Thu Dec 14 16:30:53 2006
@@ -77,8 +77,8 @@
return getReplicationThread();
}
- protected BioReplicationThread getReplicationThread() {
- BioReplicationThread result = new BioReplicationThread(this);
+ protected BioReplicationTask getReplicationThread() {
+ BioReplicationTask result = new BioReplicationTask(this);
result.setOptions(getWorkerThreadOptions());
result.setUseBufferPool(this.getUseBufferPool());
return result;
@@ -129,7 +129,7 @@
if ( log.isWarnEnabled() )
log.warn("All BIO server replication threads are busy, unable to handle more requests until a thread is freed up.");
}
- BioReplicationThread thread = (BioReplicationThread)getPool().getWorker();
+ BioReplicationTask thread = (BioReplicationTask)getPool().getWorker();
if ( thread == null ) continue; //should never happen
try {
socket = serverSocket.accept();
Copied: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java (from r487408, tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java)
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?view=diff&rev=487409&p1=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java&r1=487408&p2=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java&r2=487409
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java Thu Dec 14 16:30:53 2006
@@ -44,15 +44,15 @@
*
* @version $Revision$, $Date$
*/
-public class BioReplicationThread extends AbstractRxTask {
+public class BioReplicationTask extends AbstractRxTask {
- protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BioReplicationThread.class );
+ protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BioReplicationTask.class );
protected Socket socket;
protected ObjectReader reader;
- public BioReplicationThread (ListenCallback callback) {
+ public BioReplicationTask (ListenCallback callback) {
super(callback);
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?view=diff&rev=487409&r1=487408&r2=487409
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Thu Dec 14 16:30:53 2006
@@ -110,7 +110,7 @@
}
public AbstractRxTask getWorkerThread() {
- NioReplicationThread thread = new NioReplicationThread(this,this);
+ NioReplicationTask thread = new NioReplicationTask(this,this);
thread.setUseBufferPool(this.getUseBufferPool());
thread.setRxBufSize(getRxBufSize());
thread.setOptions(getWorkerThreadOptions());
@@ -365,7 +365,7 @@
* will then de-register the channel on the next select call.
*/
protected void readDataFromSocket(SelectionKey key) throws Exception {
- NioReplicationThread worker = (NioReplicationThread) getPool().getWorker();
+ NioReplicationTask worker = (NioReplicationTask) getPool().getWorker();
if (worker == null) {
// No threads available, do nothing, the selection
// loop will keep calling this method until a
Copied: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java (from r487408, tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java)
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java?view=diff&rev=487409&p1=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java&r1=487408&p2=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java&r2=487409
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java Thu Dec 14 16:30:53 2006
@@ -47,15 +47,15 @@
*
* @version $Revision$, $Date$
*/
-public class NioReplicationThread extends AbstractRxTask {
+public class NioReplicationTask extends AbstractRxTask {
- private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( NioReplicationThread.class );
+ private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( NioReplicationTask.class );
private ByteBuffer buffer = null;
private SelectionKey key;
private int rxBufSize;
private NioReceiver receiver;
- public NioReplicationThread (ListenCallback callback, NioReceiver receiver)
+ public NioReplicationTask (ListenCallback callback, NioReceiver receiver)
{
super(callback);
this.receiver = receiver;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org