Author: toad
Date: 2006-06-28 16:49:08 +0000 (Wed, 28 Jun 2006)
New Revision: 9395
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/Version.java
Log:
842: Remove nextgens' broken alternate scheduler.
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-06-28 13:44:49 UTC (rev 9394)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-06-28 16:49:08 UTC (rev 9395)
@@ -126,81 +126,8 @@
clientGrabber.add(cr, req);
}
- public synchronized SendableRequest removeFirst() {
- if(node.currentScheduler == Node.SCHEDULER_IMPROVED_1)
- return improved_scheduler_1_removeFirst();
- else
- return default_Scheduler_removeFirst();
- }
-
- public SendableRequest improved_scheduler_1_removeFirst() {
+ public SendableRequest removeFirst() {
// Priorities start at 0
- 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");
- 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);
- 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;
- }
- }
- 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() {
- // Priorities start at 0
Logger.minor(this, "removeFirst()");
for(int i=0;i<RequestStarter.MINIMUM_PRIORITY_CLASS;i++) {
SortedVectorByNumber s = priorities[i];
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-06-28 13:44:49 UTC (rev
9394)
+++ trunk/freenet/src/freenet/node/Node.java 2006-06-28 16:49:08 UTC (rev
9395)
@@ -425,11 +425,6 @@
/** How long we're over the nodeAveragePingTime threshold before we
alert (in milliseconds)*/
public static final long MAX_NODE_AVERAGE_PING_TIME_ALERT_DELAY =
10*60*1000; // 10 minutes
- public static final int SCHEDULER_DEFAULT = 0;
- public static final int SCHEDULER_IMPROVED_1 = 1;
-
- public final int currentScheduler;
-
/** Accept one request every 10 seconds regardless, to ensure we update
the
* block send time.
*/
@@ -1433,20 +1428,6 @@
// Select the request scheduler
- nodeConfig.register("scheduler", 0, sortOrder++, true,
"Scheduler", "Scheduler",
- new IntCallback(){
- public int get(){
- return currentScheduler;
- }
-
- public void set(int val){
- if(val == get()) return;
- //FIXME: implement!
- }
- });
-
- currentScheduler = nodeConfig.getInt("scheduler");
-
// FIXME make all the below arbitrary constants configurable!
archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS,
MAX_CACHED_ARCHIVE_DATA, MAX_ARCHIVE_SIZE, MAX_ARCHIVED_FILE_SIZE,
MAX_CACHED_ELEMENTS, random, tempFilenameGenerator);
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-28 13:44:49 UTC (rev
9394)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-28 16:49:08 UTC (rev
9395)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 841;
+ private static final int buildNumber = 842;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 839;
