You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/21 08:33:08 UTC

svn commit: r596969 - in /mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr: AprIoProcessor.java AprSocketAcceptor.java

Author: trustin
Date: Tue Nov 20 23:33:05 2007
New Revision: 596969

URL: http://svn.apache.org/viewvc?rev=596969&view=rev
Log:
Adjusted the initial capacity of the pollset

Modified:
    mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
    mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java

Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?rev=596969&r1=596968&r2=596969&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java Tue Nov 20 23:33:05 2007
@@ -45,7 +45,7 @@
  */
 
 public class AprIoProcessor extends AbstractPollingIoProcessor<AprSession> {
-    private static final int INITIAL_CAPACITY = 32;
+    private static final int INITIAL_CAPACITY = 1024;
     
     private final Map<Long, AprSession> allSessions =
         new HashMap<Long, AprSession>(INITIAL_CAPACITY);
@@ -79,14 +79,23 @@
         bufferPool = Pool.create(AprLibrary.getInstance().getRootPool());
         
         boolean success = false;
+        long newPollset;
         try {
-            // TODO : optimize/parameterize those values
-            pollset = Poll
-                    .create(
-                            INITIAL_CAPACITY,
-                            AprLibrary.getInstance().getRootPool(),
-                            Poll.APR_POLLSET_THREADSAFE,
-                            10000000);
+            newPollset = Poll.create(
+                    INITIAL_CAPACITY,
+                    AprLibrary.getInstance().getRootPool(),
+                    Poll.APR_POLLSET_THREADSAFE,
+                    Long.MAX_VALUE);
+
+            if (newPollset == 0) {
+                newPollset = Poll.create(
+                        62,
+                        AprLibrary.getInstance().getRootPool(),
+                        Poll.APR_POLLSET_THREADSAFE,
+                        Long.MAX_VALUE);
+            }
+            
+            pollset = newPollset;
             if (pollset < 0) {
                 if (Status.APR_STATUS_IS_ENOTIMPL(- (int) pollset)) {
                     throw new RuntimeIoException(

Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java?rev=596969&r1=596968&r2=596969&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java Tue Nov 20 23:33:05 2007
@@ -25,7 +25,7 @@
 
 public class AprSocketAcceptor extends AbstractPollingIoAcceptor<AprSession, Long> implements SocketAcceptor {
 
-    private static final int INITIAL_CAPACITY = 32;
+    private static final int INITIAL_CAPACITY = 1024;
 
     private final Object wakeupLock = new Object();
     private long wakeupSocket;
@@ -151,13 +151,20 @@
         
         boolean success = false;
         try {
-            // TODO : optimize/parameterize those values
-            pollset = Poll
-                    .create(
+            pollset = Poll.create(
                             INITIAL_CAPACITY,
                             pool,
                             Poll.APR_POLLSET_THREADSAFE,
-                            10000000);
+                            Long.MAX_VALUE);
+            
+            if (pollset == 0) {
+                pollset = Poll.create(
+                        62,
+                        pool,
+                        Poll.APR_POLLSET_THREADSAFE,
+                        Long.MAX_VALUE);
+            }
+
             if (pollset < 0) {
                 if (Status.APR_STATUS_IS_ENOTIMPL(- (int) pollset)) {
                     throw new RuntimeIoException(