Author: toad
Date: 2007-08-22 23:24:46 +0000 (Wed, 22 Aug 2007)
New Revision: 14849
Modified:
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeStarter.java
trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
Log:
Remove swapRequestInterval. It's now just a constant, and will soon be
dynamically calculated.
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2007-08-22 23:16:29 UTC
(rev 14848)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2007-08-22 23:24:46 UTC
(rev 14849)
@@ -52,10 +52,11 @@
static final int SWAP_MAX_HTL = 10;
/** Number of swap evaluations, either incoming or outgoing, between
resetting our location. */
static final int SWAP_RESET = 4000;
+ // FIXME vary automatically
+ static final int SEND_SWAP_INTERVAL = 8000;
private static boolean logMINOR;
final RandomSource r;
final SwapRequestSender sender;
- SwapRequestInterval interval;
Node node;
long timeLastSuccessfullySwapped;
@@ -120,9 +121,8 @@
* Start a thread to send FNPSwapRequests every second when
* we are not locked.
*/
- public void startSender(Node n, SwapRequestInterval interval) {
+ public void startSender(Node n) {
this.node = n;
- this.interval = interval;
n.executor.execute(sender, "SwapRequest sender");
}
@@ -132,16 +132,13 @@
*/
public class SwapRequestSender implements Runnable {
- // FIXME vary automatically
- int sendInterval = 8000;
-
public void run() {
while(true) {
try {
long startTime = System.currentTimeMillis();
double nextRandom = r.nextDouble();
while(true) {
- int sleepTime = interval.getValue();
+ int sleepTime = SEND_SWAP_INTERVAL;
sleepTime *= nextRandom;
sleepTime = Math.min(sleepTime, Integer.MAX_VALUE);
long endTime = startTime + (int)sleepTime;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-08-22 23:16:29 UTC (rev
14848)
+++ trunk/freenet/src/freenet/node/Node.java 2007-08-22 23:24:46 UTC (rev
14849)
@@ -333,13 +333,11 @@
final LRUHashtable cachedPubKeys;
final boolean testnetEnabled;
final TestnetHandler testnetHandler;
- final StaticSwapRequestInterval swapInterval;
public final DoubleTokenBucket outputThrottle;
private int outputBandwidthLimit;
private int inputBandwidthLimit;
boolean inputLimitDefault;
public static final short DEFAULT_MAX_HTL = (short)10;
- public static final int DEFAULT_SWAP_INTERVAL = 2000;
private short maxHTL;
/** Type identifier for fproxy node to node messages, as sent on
DMT.nodeToNodeMessage's */
public static final int N2N_MESSAGE_TYPE_FPROXY = 1;
@@ -671,21 +669,6 @@
ibwLimit = obwLimit * 4;
}
- // SwapRequestInterval
-
- nodeConfig.register("swapRequestSendInterval",
DEFAULT_SWAP_INTERVAL, sortOrder++, true, false,
- "Node.swapRInterval", "Node.swapRIntervalLong",
- new IntCallback() {
- public int get() {
- return
swapInterval.fixedInterval;
- }
- public void set(int val) throws
InvalidConfigValueException {
- swapInterval.set(val);
- }
- });
-
- swapInterval = new
StaticSwapRequestInterval(nodeConfig.getInt("swapRequestSendInterval"));
-
// Testnet.
// Cannot be enabled/disabled on the fly.
// If enabled, forces certain other config options.
@@ -1274,8 +1257,6 @@
public void start(boolean noSwaps) throws NodeInitException {
- if(!noSwaps)
- lm.startSender(this, this.swapInterval);
dispatcher.start(nodeStats); // must be before usm
dnsr.start();
ps.start(nodeStats);
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2007-08-22 23:16:29 UTC
(rev 14848)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2007-08-22 23:24:46 UTC
(rev 14849)
@@ -331,7 +331,7 @@
*/
public static Node createTestNode(int port, String testName, boolean
doClient,
boolean doSwapping, boolean disableProbabilisticHTLs,
short maxHTL,
- int dropProb, int swapInterval, RandomSource random,
Executor executor) throws NodeInitException {
+ int dropProb, RandomSource random, Executor executor)
throws NodeInitException {
File baseDir = new File(testName);
File portDir = new File(baseDir, Integer.toString(port));
@@ -356,7 +356,6 @@
configFS.putSingle("node.nodeDir", portDir.toString());
configFS.put("node.maxHTL", maxHTL);
configFS.put("node.testingDropPacketsEvery", dropProb);
- configFS.put("node.swapRequestSendInterval", swapInterval);
PersistentConfig config = new PersistentConfig(configFS);
Modified: trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
2007-08-22 23:16:29 UTC (rev 14848)
+++ trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
2007-08-22 23:24:46 UTC (rev 14849)
@@ -33,8 +33,8 @@
RandomSource random = NodeStarter.globalTestInit("pingtest");
// Create 2 nodes
Executor executor = new PooledExecutor();
- Node node1 = NodeStarter.createTestNode(5001, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, Node.DEFAULT_SWAP_INTERVAL, random,
executor);
- Node node2 = NodeStarter.createTestNode(5002, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, Node.DEFAULT_SWAP_INTERVAL, random,
executor);
+ Node node1 = NodeStarter.createTestNode(5001, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, random, executor);
+ Node node2 = NodeStarter.createTestNode(5002, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, random, executor);
// Connect
node1.connect(node2);
node2.connect(node1);
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2007-08-22 23:16:29 UTC (rev 14848)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2007-08-22 23:24:46 UTC (rev 14849)
@@ -54,7 +54,7 @@
Executor executor = new PooledExecutor();
for(int i=0;i<NUMBER_OF_NODES;i++) {
nodes[i] =
- NodeStarter.createTestNode(5001+i, wd, false, true, true,
MAX_HTL, 20 /* 5% */, Node.DEFAULT_SWAP_INTERVAL, random, executor);
+ NodeStarter.createTestNode(5001+i, wd, false, true, true,
MAX_HTL, 20 /* 5% */, random, executor);
Logger.normal(RealNodeRoutingTest.class, "Created node "+i);
}
SimpleFieldSet refs[] = new SimpleFieldSet[NUMBER_OF_NODES];
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2007-08-22 23:16:29 UTC (rev 14848)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2007-08-22 23:24:46 UTC (rev 14849)
@@ -48,7 +48,7 @@
Executor executor = new PooledExecutor();
for(int i=0;i<NUMBER_OF_NODES;i++) {
nodes[i] =
- NodeStarter.createTestNode(5001+i, wd, false, true, true,
MAX_HTL, 0 /* no dropped packets */, /* Node.DEFAULT_SWAP_INTERVAL */ 0,
random, executor);
+ NodeStarter.createTestNode(5001+i, wd, false, true, true,
MAX_HTL, 0 /* no dropped packets */, random, executor);
Logger.normal(RealNodeRoutingTest.class, "Created node "+i);
}
Logger.normal(RealNodeRoutingTest.class, "Created "+NUMBER_OF_NODES+"
nodes");
