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:25:18 UTC
svn commit: r487407 - in
/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport:
ReceiverBase.java RxTaskPool.java ThreadPool.java WorkerThread.java
bio/BioReceiver.java nio/NioReceiver.java
Author: fhanik
Date: Thu Dec 14 16:25:17 2006
New Revision: 487407
URL: http://svn.apache.org/viewvc?view=rev&rev=487407
Log:
Refactor, name change in preparation to swap in Executor, and to make increase thread fairness when receiving data
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java
- copied, changed from r486299, tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ThreadPool.java
Removed:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ThreadPool.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/WorkerThread.java
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/ReceiverBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?view=diff&rev=487407&r1=487406&r2=487407
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java Thu Dec 14 16:25:17 2006
@@ -38,7 +38,7 @@
* @author not attributable
* @version 1.0
*/
-public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, ThreadPool.ThreadCreator {
+public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, RxTaskPool.TaskCreator {
public static final int OPTION_DIRECT_BUFFER = 0x0004;
@@ -53,7 +53,7 @@
private int rxBufSize = 43800;
private int txBufSize = 25188;
private boolean listen = false;
- private ThreadPool pool;
+ private RxTaskPool pool;
private boolean direct = true;
private long tcpSelectorTimeout = 5000;
//how many times to search for an available socket
@@ -270,7 +270,7 @@
return listener;
}
- public ThreadPool getPool() {
+ public RxTaskPool getPool() {
return pool;
}
@@ -367,7 +367,7 @@
this.log = log;
}
- public void setPool(ThreadPool pool) {
+ public void setPool(RxTaskPool pool) {
this.pool = pool;
}
Copied: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java (from r486299, tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ThreadPool.java)
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java?view=diff&rev=487407&p1=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ThreadPool.java&r1=486299&p2=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java&r2=487407
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ThreadPool.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java Thu Dec 14 16:25:17 2006
@@ -25,7 +25,7 @@
* @version 1.0
*/
-public class ThreadPool
+public class RxTaskPool
{
/**
* A very simple thread pool class. The pool size is set at
@@ -43,14 +43,14 @@
private int maxThreads;
private int minThreads;
- private ThreadCreator creator = null;
+ private TaskCreator creator = null;
private static synchronized int inc() {
return counter++;
}
- public ThreadPool (int maxThreads, int minThreads, ThreadCreator creator) throws Exception {
+ public RxTaskPool (int maxThreads, int minThreads, TaskCreator creator) throws Exception {
// fill up the pool with worker threads
this.maxThreads = maxThreads;
this.minThreads = minThreads;
@@ -155,11 +155,11 @@
this.minThreads = minThreads;
}
- public ThreadCreator getThreadCreator() {
+ public TaskCreator getThreadCreator() {
return this.creator;
}
- public static interface ThreadCreator {
+ public static interface TaskCreator {
public WorkerThread getWorkerThread();
}
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/WorkerThread.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/WorkerThread.java?view=diff&rev=487407&r1=487406&r2=487407
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/WorkerThread.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/WorkerThread.java Thu Dec 14 16:25:17 2006
@@ -27,12 +27,12 @@
* @version $Revision$ $Date$
*/
public abstract class WorkerThread extends Thread
-{
+{
public static final int OPTION_DIRECT_BUFFER = ReceiverBase.OPTION_DIRECT_BUFFER;
private ListenCallback callback;
- private ThreadPool pool;
+ private RxTaskPool pool;
private boolean doRun = true;
private int options;
protected boolean useBufferPool = true;
@@ -41,7 +41,7 @@
this.callback = callback;
}
- public void setPool(ThreadPool pool) {
+ public void setPool(RxTaskPool pool) {
this.pool = pool;
}
@@ -57,7 +57,7 @@
this.doRun = doRun;
}
- public ThreadPool getPool() {
+ public RxTaskPool getPool() {
return pool;
}
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=487407&r1=487406&r2=487407
==============================================================================
--- 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:25:17 2006
@@ -23,7 +23,7 @@
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.transport.ReceiverBase;
-import org.apache.catalina.tribes.transport.ThreadPool;
+import org.apache.catalina.tribes.transport.RxTaskPool;
import org.apache.catalina.tribes.transport.WorkerThread;
/**
@@ -54,7 +54,7 @@
*/
public void start() throws IOException {
try {
- setPool(new ThreadPool(getMaxThreads(),getMinThreads(),this));
+ setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
} catch (Exception x) {
log.fatal("ThreadPool can initilzed. Listener not started", x);
if ( x instanceof IOException ) throw (IOException)x;
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=487407&r1=487406&r2=487407
==============================================================================
--- 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:25:17 2006
@@ -31,7 +31,7 @@
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.transport.Constants;
import org.apache.catalina.tribes.transport.ReceiverBase;
-import org.apache.catalina.tribes.transport.ThreadPool;
+import org.apache.catalina.tribes.transport.RxTaskPool;
import org.apache.catalina.tribes.transport.WorkerThread;
import org.apache.catalina.tribes.util.StringManager;
import java.util.LinkedList;
@@ -90,7 +90,7 @@
public void start() throws IOException {
try {
// setPool(new ThreadPool(interestOpsMutex, getMaxThreads(),getMinThreads(),this));
- setPool(new ThreadPool(getMaxThreads(),getMinThreads(),this));
+ setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
} catch (Exception x) {
log.fatal("ThreadPool can initilzed. Listener not started", x);
if ( x instanceof IOException ) throw (IOException)x;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r487407 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport:
ReceiverBase.java RxTaskPool.java ThreadPool.java WorkerThread.java bio/BioReceiver.java
nio/NioReceiver.java
Posted by Remy Maucherat <re...@apache.org>.
Filip Hanik - Dev Lists wrote:
> you're good to go, tag away
Ok, I should be able to tag later today (a bit after 00:00 GMT+1, as usual).
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r487407 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport:
ReceiverBase.java RxTaskPool.java ThreadPool.java WorkerThread.java bio/BioReceiver.java
nio/NioReceiver.java
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
you're good to go, tag away
Filip
Remy Maucherat wrote:
> fhanik@apache.org wrote:
>> Author: fhanik
>> Date: Thu Dec 14 16:25:17 2006
>> New Revision: 487407
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=487407
>> Log:
>> Refactor, name change in preparation to swap in Executor, and to make
>> increase thread fairness when receiving data
>
> Ok, when can I tag then ?
>
> Rémy
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r487407 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport:
ReceiverBase.java RxTaskPool.java ThreadPool.java WorkerThread.java bio/BioReceiver.java
nio/NioReceiver.java
Posted by Remy Maucherat <re...@apache.org>.
fhanik@apache.org wrote:
> Author: fhanik
> Date: Thu Dec 14 16:25:17 2006
> New Revision: 487407
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=487407
> Log:
> Refactor, name change in preparation to swap in Executor, and to make increase thread fairness when receiving data
Ok, when can I tag then ?
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org