Author: nextgens
Date: 2006-06-18 13:19:16 +0000 (Sun, 18 Jun 2006)
New Revision: 9296
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/Version.java
Log:
825:
* fixes a typo on
* Increase the request rate on my scheduler (It was giving up to fast)
* remove some eclipse warnings (useless imports)
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-06-18 11:27:29 UTC (rev 9295)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-06-18 13:19:16 UTC (rev 9296)
@@ -127,55 +127,68 @@
public SendableRequest improved_scheduler_1_removeFirst() {
// Priorities start at 0
- Logger.minor(this, "removeFirst() (improved_1)");
- short count = 6;
- while(count>0){
- int i = random.nextInt(prioritySelecter.length);
- SortedVectorByNumber s =
priorities[prioritySelecter[i]];
- if(s == null) {
+ Logger.minor(this, "removeFirst() (improved_1)");
+ int i = random.nextInt(prioritySelecter.length);
+ SortedVectorByNumber s = priorities[prioritySelecter[i]];
+ // TODO : do it recursively
+ // FIXME : is 0 used everytimes ?
+ if(s == null) {
+ Logger.minor(this, "Priority "+prioritySelecter[i]+" is
null");
+ s = priorities[prioritySelecter[++i %
RequestStarter.MINIMUM_PRIORITY_CLASS]];
+ if(s == null){
Logger.minor(this, "Priority
"+prioritySelecter[i]+" is null");
- count--;
- continue;
+ s = priorities[prioritySelecter[++i %
RequestStarter.MINIMUM_PRIORITY_CLASS]];
+ if(s == null){
+ Logger.minor(this, "Priority
"+prioritySelecter[i]+" is null");
+ s = priorities[prioritySelecter[++i %
RequestStarter.MINIMUM_PRIORITY_CLASS]];
+ if(s == null){
+ Logger.minor(this, "Priority
"+prioritySelecter[i]+" is null");
+ s =
priorities[prioritySelecter[++i % RequestStarter.MINIMUM_PRIORITY_CLASS]];
+ if(s == null){
+ Logger.minor(this,
"Priority "+prioritySelecter[i]+" is null");
+ s =
priorities[prioritySelecter[++i % RequestStarter.MINIMUM_PRIORITY_CLASS]];
+ if(s == null)
+ return null;
+ }
+ }
+ }
}
-
- i=prioritySelecter[i];
-
- SectoredRandomGrabArrayWithInt rga =
(SectoredRandomGrabArrayWithInt) s.getFirst(); // will discard finished items
- if(rga == null) {
- Logger.minor(this, "No retrycount's in priority
"+i);
+ }
+
+ i=prioritySelecter[i];
+
+ SectoredRandomGrabArrayWithInt rga =
(SectoredRandomGrabArrayWithInt) s.getFirst(); // will discard finished items
+ if(rga == null) {
+ Logger.minor(this, "No retrycount's in priority "+i);
+ priorities[i] = null;
+ return null;
+ }
+ SendableRequest req = (SendableRequest) rga.removeRandom();
+ if(rga.isEmpty()) {
+ Logger.minor(this, "Removing retrycount
"+rga.getNumber());
+ s.remove(rga.getNumber());
+ if(s.isEmpty()) {
+ Logger.minor(this, "Removing priority "+i);
priorities[i] = null;
- count--;
- continue;
}
- SendableRequest req = (SendableRequest)
rga.removeRandom();
- if(rga.isEmpty()) {
- Logger.minor(this, "Removing retrycount
"+rga.getNumber());
- s.remove(rga.getNumber());
- if(s.isEmpty()) {
- Logger.minor(this, "Removing priority
"+i);
- priorities[i] = null;
- }
- }
- if(req == null) {
- Logger.minor(this, "No requests in priority
"+i+", retrycount "+rga.getNumber()+" ("+rga+")");
- count--;
- continue;
- }
- if(req.getPriorityClass() > i) {
- // Reinsert it
- Logger.minor(this, "In wrong priority class:
"+req);
- innerRegister(req);
- continue;
- }
- Logger.minor(this, "removeFirst() returning "+req+"
("+rga.getNumber()+")");
- ClientRequester cr = req.getClientRequest();
- HashSet v = (HashSet)
allRequestsByClientRequest.get(cr);
- v.remove(req);
- if(v.isEmpty())
- allRequestsByClientRequest.remove(cr);
- return req;
}
- return null;
+ if(req == null) {
+ Logger.minor(this, "No requests in priority "+i+",
retrycount "+rga.getNumber()+" ("+rga+")");
+ return null;
+ }
+ if(req.getPriorityClass() > i) {
+ // Reinsert it
+ Logger.minor(this, "In wrong priority class: "+req);
+ innerRegister(req);
+ return null;
+ }
+ Logger.minor(this, "removeFirst() returning "+req+"
("+rga.getNumber()+")");
+ ClientRequester cr = req.getClientRequest();
+ HashSet v = (HashSet) allRequestsByClientRequest.get(cr);
+ v.remove(req);
+ if(v.isEmpty())
+ allRequestsByClientRequest.remove(cr);
+ return req;
}
public SendableRequest default_Scheduler_removeFirst() {
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-06-18
11:27:29 UTC (rev 9295)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-06-18
13:19:16 UTC (rev 9296)
@@ -27,14 +27,11 @@
import freenet.client.InsertBlock;
import freenet.client.InserterException;
import freenet.client.events.EventDumper;
-import freenet.config.Option;
-import freenet.config.SubConfig;
import freenet.crypt.RandomSource;
import freenet.io.comm.Peer;
import freenet.io.comm.PeerParseException;
import freenet.keys.FreenetURI;
import freenet.keys.InsertableClientSSK;
-import freenet.keys.Key;
import freenet.support.ArrayBucket;
import freenet.support.Bucket;
import freenet.support.BucketTools;
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-06-18 11:27:29 UTC (rev 9295)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-06-18 13:19:16 UTC (rev 9296)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
import java.net.SocketTimeoutException;
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-18 11:27:29 UTC (rev
9295)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-18 13:19:16 UTC (rev
9296)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 824;
+ private static final int buildNumber = 825;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 765;
