[freenet-cvs] r18511 - in trunk/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2008-03-13 20:01:52 +0000 (Thu, 13 Mar 2008)
New Revision: 18511

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
   trunk/freenet/src/freenet/node/NodeClientCore.java
   trunk/freenet/src/freenet/node/RequestScheduler.java
   trunk/freenet/src/freenet/node/RequestStarterGroup.java
Log:
countQueuedRequests()

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-03-13 20:00:06 UTC (rev 18510)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-03-13 20:01:52 UTC (rev 18511)
@@ -701,4 +701,10 @@
                        }
                }
        }
+
+       public long countQueuedRequests() {
+               if(pendingKeys != null)
+                       return pendingKeys.size();
+               else return 0;
+       }
 }

Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java  2008-03-13 20:00:06 UTC 
(rev 18510)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java  2008-03-13 20:01:52 UTC 
(rev 18511)
@@ -1164,4 +1164,8 @@
        public FreenetURI[] getBookmarkURIs() {
                return toadletContainer.getBookmarkURIs();
        }
+
+       public long countQueuedRequests() {
+               return requestStarters.countQueuedRequests();
+       }
 }

Modified: trunk/freenet/src/freenet/node/RequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestScheduler.java        2008-03-13 
20:00:06 UTC (rev 18510)
+++ trunk/freenet/src/freenet/node/RequestScheduler.java        2008-03-13 
20:01:52 UTC (rev 18511)
@@ -40,5 +40,6 @@
         * Note: If you don't want your requests to be subject to cooldown 
(e.g. in fproxy), make 
         * your max retry count less than this (and more than -1). */
        public static final int COOLDOWN_RETRIES = 3;
+       public long countQueuedRequests();

 }

Modified: trunk/freenet/src/freenet/node/RequestStarterGroup.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarterGroup.java     2008-03-13 
20:00:06 UTC (rev 18510)
+++ trunk/freenet/src/freenet/node/RequestStarterGroup.java     2008-03-13 
20:01:52 UTC (rev 18511)
@@ -223,5 +223,12 @@
        public double getRealWindow() {
                return throttleWindow.realCurrentValue();
        }
+
+       public long countQueuedRequests() {
+               return chkFetchScheduler.countQueuedRequests() +
+                       sskFetchScheduler.countQueuedRequests() +
+                       chkPutScheduler.countQueuedRequests() +
+                       sskPutScheduler.countQueuedRequests();
+       }

 }