Author: markt
Date: Thu Jan 17 09:12:56 2013
New Revision: 1434598
URL: http://svn.apache.org/viewvc?rev=1434598&view=rev
Log:
Remove unused attributes
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1434598&r1=1434597&r2=1434598&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Jan
17 09:12:56 2013
@@ -82,9 +82,6 @@ public class Http11AprProtocol extends A
public void setPollerSize(int pollerSize) {
endpoint.setMaxConnections(pollerSize); }
public int getPollerSize() { return endpoint.getMaxConnections(); }
- public void setPollerThreadCount(int pollerThreadCount) {
((AprEndpoint)endpoint).setPollerThreadCount(pollerThreadCount); }
- public int getPollerThreadCount() { return
((AprEndpoint)endpoint).getPollerThreadCount(); }
-
public int getSendfileSize() { return
((AprEndpoint)endpoint).getSendfileSize(); }
public void setSendfileSize(int sendfileSize) {
((AprEndpoint)endpoint).setSendfileSize(sendfileSize); }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1434598&r1=1434597&r2=1434598&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Jan 17
09:12:56 2013
@@ -177,14 +177,6 @@ public class AprEndpoint extends Abstrac
/**
- * Poller thread count.
- */
- protected int pollerThreadCount = 0;
- public void setPollerThreadCount(int pollerThreadCount) {
this.pollerThreadCount = pollerThreadCount; }
- public int getPollerThreadCount() { return pollerThreadCount; }
-
-
- /**
* The socket poller.
*/
protected Poller poller = null;
@@ -436,35 +428,11 @@ public class AprEndpoint extends Abstrac
useSendfile = false;
}
- // Initialize thread count defaults for acceptor, poller and sendfile
+ // Initialize thread count default for acceptor
if (acceptorThreadCount == 0) {
// FIXME: Doesn't seem to work that well with multiple accept
threads
acceptorThreadCount = 1;
}
- if (pollerThreadCount == 0) {
- if ((OS.IS_WIN32 || OS.IS_WIN64) && (getMaxConnections() > 1024)) {
- // The maximum per poller to get reasonable performance is 1024
- pollerThreadCount = getMaxConnections() / 1024;
- // Adjust poller size so that it won't reach the limit
- setMaxConnections(
- getMaxConnections() - (getMaxConnections() % 1024));
- } else {
- // No explicit poller size limitation
- pollerThreadCount = 1;
- }
- }
- if (sendfileThreadCount == 0) {
- if ((OS.IS_WIN32 || OS.IS_WIN64) && (sendfileSize > 1024)) {
- // The maximum per poller to get reasonable performance is 1024
- sendfileThreadCount = sendfileSize / 1024;
- // Adjust poller size so that it won't reach the limit
- sendfileSize = sendfileSize - (sendfileSize % 1024);
- } else {
- // No explicit poller size limitation
- // FIXME: Default to one per CPU ?
- sendfileThreadCount = 1;
- }
- }
// Delay accepting of new connections until data is available
// Only Linux kernels 2.4 + have that implemented
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
