[freenet-cvs] r14309 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2007-07-24 17:04:54 +0000 (Tue, 24 Jul 2007)
New Revision: 14309

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Remove limit of 256 completed requests.

Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java   2007-07-24 16:58:47 UTC 
(rev 14308)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java   2007-07-24 17:04:54 UTC 
(rev 14309)
@@ -10,7 +10,6 @@
 import freenet.client.HighLevelSimpleClient;
 import freenet.client.InsertContext;
 import freenet.node.NodeClientCore;
-import freenet.support.LRUQueue;
 import freenet.support.Logger;

 /**
@@ -22,15 +21,12 @@
        // FIXME frost-specific hack
        private static final Object frostClient = new Object();

-       /** Maximum number of unacknowledged completed requests */
-       private static final int MAX_UNACKED_REQUESTS = 256;
-       
        public FCPClient(String name2, FCPServer server, FCPConnectionHandler 
handler, boolean isGlobalQueue) {
                this.name = name2;
                if(name == null) throw new NullPointerException();
                this.currentConnection = handler;
                this.runningPersistentRequests = new HashSet();
-               this.completedUnackedRequests = new LRUQueue();
+               this.completedUnackedRequests = new Vector();
                this.clientRequestsByIdentifier = new HashMap();
                this.server = server;
                this.core = server.core;
@@ -58,7 +54,7 @@
        /** Currently running persistent requests */
        private final HashSet runningPersistentRequests;
        /** Completed unacknowledged persistent requests */
-       private final LRUQueue completedUnackedRequests;
+       private final Vector completedUnackedRequests;
        /** ClientRequest's by identifier */
        private final HashMap clientRequestsByIdentifier;
        /** Client (one FCPClient = one HighLevelSimpleClient = one round-robin 
slot) */
@@ -101,12 +97,8 @@
                ClientRequest dropped = null;
                synchronized(this) {
                        if(runningPersistentRequests.remove(get)) {
-                               completedUnackedRequests.push(get);
+                               completedUnackedRequests.add(get);
                        }       
-                       if(completedUnackedRequests.size() > 
MAX_UNACKED_REQUESTS) {
-                               dropped = (ClientRequest) 
completedUnackedRequests.pop();
-                               
clientRequestsByIdentifier.remove(dropped.getIdentifier());
-                       }
                }
                if(dropped != null) {
                        dropped.dropped();
@@ -151,7 +143,7 @@
                        if((old != null) && (old != cg))
                                throw new IdentifierCollisionException();
                        if(cg.hasFinished()) {
-                               completedUnackedRequests.push(cg);
+                               completedUnackedRequests.add(cg);
                        } else {
                                runningPersistentRequests.add(cg);
                                if(startLater) toStart.add(cg);