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

[toad at freenetproject.org]

Author: toad
Date: 2008-02-05 00:52:14 +0000 (Tue, 05 Feb 2008)
New Revision: 17542

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
   trunk/freenet/src/freenet/node/RequestStarterGroup.java
Log:
Pass in core, don't pull it from node, since we're inside the constructor for core!

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2008-02-05 00:42:46 UTC (rev 17541)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2008-02-05 00:52:14 UTC (rev 17542)
@@ -19,6 +19,7 @@
 import freenet.keys.KeyVerifyException;
 import freenet.node.LowLevelGetException;
 import freenet.node.Node;
+import freenet.node.NodeClientCore;
 import freenet.node.RequestScheduler;
 import freenet.node.RequestStarter;
 import freenet.node.SendableGet;
@@ -159,7 +160,7 @@
 			RequestStarter.MINIMUM_PRIORITY_CLASS
 	};
 	
-	public ClientRequestScheduler(boolean forInserts, boolean forSSKs, RandomSource random, RequestStarter starter, Node node, SubConfig sc, String name) {
+	public ClientRequestScheduler(boolean forInserts, boolean forSSKs, RandomSource random, RequestStarter starter, Node node, NodeClientCore core, SubConfig sc, String name) {
 		this.starter = starter;
 		this.random = random;
 		this.node = node;
@@ -182,7 +183,7 @@
 		if(!forInserts) {
 			offeredKeys = new OfferedKeysList[RequestStarter.NUMBER_OF_PRIORITY_CLASSES];
 			for(short i=0;i<RequestStarter.NUMBER_OF_PRIORITY_CLASSES;i++)
-				offeredKeys[i] = new OfferedKeysList(node.clientCore, random, i);
+				offeredKeys[i] = new OfferedKeysList(core, random, i);
 		} else {
 			offeredKeys = null;
 		}

Modified: trunk/freenet/src/freenet/node/RequestStarterGroup.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarterGroup.java	2008-02-05 00:42:46 UTC (rev 17541)
+++ trunk/freenet/src/freenet/node/RequestStarterGroup.java	2008-02-05 00:52:14 UTC (rev 17542)
@@ -45,27 +45,27 @@
 		throttleWindowRequest = new ThrottleWindowManager(2.0, fs == null ? null : fs.subset("ThrottleWindowRequest"), node);
 		chkRequestThrottle = new MyRequestThrottle(throttleWindow, 5000, "CHK Request", fs == null ? null : fs.subset("CHKRequestThrottle"), 32768);
 		chkRequestStarter = new RequestStarter(core, chkRequestThrottle, "CHK Request starter ("+portNumber+ ')', stats.requestOutputThrottle, stats.requestInputThrottle, stats.localChkFetchBytesSentAverage, stats.localChkFetchBytesReceivedAverage, false, false);
-		chkFetchScheduler = new ClientRequestScheduler(false, false, random, chkRequestStarter, node, schedulerConfig, "CHKrequester");
+		chkFetchScheduler = new ClientRequestScheduler(false, false, random, chkRequestStarter, node, core, schedulerConfig, "CHKrequester");
 		chkRequestStarter.setScheduler(chkFetchScheduler);
 		chkRequestStarter.start();
 		//insertThrottle = new ChainedRequestThrottle(10000, 2.0F, requestThrottle);
 		// FIXME reenable the above
 		chkInsertThrottle = new MyRequestThrottle(throttleWindow, 20000, "CHK Insert", fs == null ? null : fs.subset("CHKInsertThrottle"), 32768);
 		chkInsertStarter = new RequestStarter(core, chkInsertThrottle, "CHK Insert starter ("+portNumber+ ')', stats.requestOutputThrottle, stats.requestInputThrottle, stats.localChkInsertBytesSentAverage, stats.localChkInsertBytesReceivedAverage, true, false);
-		chkPutScheduler = new ClientRequestScheduler(true, false, random, chkInsertStarter, node, schedulerConfig, "CHKinserter");
+		chkPutScheduler = new ClientRequestScheduler(true, false, random, chkInsertStarter, node, core, schedulerConfig, "CHKinserter");
 		chkInsertStarter.setScheduler(chkPutScheduler);
 		chkInsertStarter.start();
 
 		sskRequestThrottle = new MyRequestThrottle(throttleWindow, 5000, "SSK Request", fs == null ? null : fs.subset("SSKRequestThrottle"), 1024);
 		sskRequestStarter = new RequestStarter(core, sskRequestThrottle, "SSK Request starter ("+portNumber+ ')', stats.requestOutputThrottle, stats.requestInputThrottle, stats.localSskFetchBytesSentAverage, stats.localSskFetchBytesReceivedAverage, false, true);
-		sskFetchScheduler = new ClientRequestScheduler(false, true, random, sskRequestStarter, node, schedulerConfig, "SSKrequester");
+		sskFetchScheduler = new ClientRequestScheduler(false, true, random, sskRequestStarter, node, core, schedulerConfig, "SSKrequester");
 		sskRequestStarter.setScheduler(sskFetchScheduler);
 		sskRequestStarter.start();
 		//insertThrottle = new ChainedRequestThrottle(10000, 2.0F, requestThrottle);
 		// FIXME reenable the above
 		sskInsertThrottle = new MyRequestThrottle(throttleWindow, 20000, "SSK Insert", fs == null ? null : fs.subset("SSKInsertThrottle"), 1024);
 		sskInsertStarter = new RequestStarter(core, sskInsertThrottle, "SSK Insert starter ("+portNumber+ ')', stats.requestOutputThrottle, stats.requestInputThrottle, stats.localSskInsertBytesSentAverage, stats.localSskFetchBytesReceivedAverage, true, true);
-		sskPutScheduler = new ClientRequestScheduler(true, true, random, sskInsertStarter, node, schedulerConfig, "SSKinserter");
+		sskPutScheduler = new ClientRequestScheduler(true, true, random, sskInsertStarter, node, core, schedulerConfig, "SSKinserter");
 		sskInsertStarter.setScheduler(sskPutScheduler);
 		sskInsertStarter.start();