Author: toad
Date: 2008-02-04 23:19:31 +0000 (Mon, 04 Feb 2008)
New Revision: 17525
Modified:
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
trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
Log:
Increase the thread limit proportionally to the number of nodes running in
tests.
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2008-02-04 23:13:10 UTC
(rev 17524)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2008-02-04 23:19:31 UTC
(rev 17525)
@@ -335,7 +335,7 @@
*/
public static Node createTestNode(int port, String testName, boolean
doClient,
boolean doSwapping, boolean disableProbabilisticHTLs,
short maxHTL,
- int dropProb, RandomSource random, Executor executor)
throws NodeInitException {
+ int dropProb, RandomSource random, Executor executor,
int threadLimit) throws NodeInitException {
File baseDir = new File(testName);
File portDir = new File(baseDir, Integer.toString(port));
@@ -363,6 +363,7 @@
configFS.put("node.alwaysAllowLocalAddresses", true);
configFS.put("node.includeLocalAddressesInNoderefs", true);
configFS.put("node.enableARKs", false);
+ configFS.put("node.threadLimit", threadLimit);
PersistentConfig config = new PersistentConfig(configFS);
Modified: trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
2008-02-04 23:13:10 UTC (rev 17524)
+++ trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
2008-02-04 23:19:31 UTC (rev 17525)
@@ -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, random, executor);
- Node node2 = NodeStarter.createTestNode(5002, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, random, executor);
+ Node node1 = NodeStarter.createTestNode(5001, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000);
+ Node node2 = NodeStarter.createTestNode(5002, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000);
// Connect
node1.connect(node2);
node2.connect(node1);
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-02-04 23:13:10 UTC (rev 17524)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-02-04 23:19:31 UTC (rev 17525)
@@ -56,7 +56,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% */, random, executor);
+ NodeStarter.createTestNode(5001+i, wd, false, true, true,
MAX_HTL, 20 /* 5% */, random, executor, 500*NUMBER_OF_NODES);
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
2008-02-04 23:13:10 UTC (rev 17524)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2008-02-04 23:19:31 UTC (rev 17525)
@@ -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 */, random, executor);
+ NodeStarter.createTestNode(5001+i, wd, false, true, true,
MAX_HTL, 0 /* no dropped packets */, random, executor, 500*NUMBER_OF_NODES);
Logger.normal(RealNodeRoutingTest.class, "Created node "+i);
}
Logger.normal(RealNodeRoutingTest.class, "Created "+NUMBER_OF_NODES+"
nodes");
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2008-02-04 23:13:10 UTC (rev 17524)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2008-02-04 23:19:31 UTC (rev 17525)
@@ -48,6 +48,7 @@
static final int EXIT_BASE = NodeInitException.EXIT_NODE_UPPER_LIMIT;
static final int EXIT_KEY_EXISTS = EXIT_BASE + 1;
static final int EXIT_UNKNOWN_ERROR_CHECKING_KEY_NOT_EXIST = EXIT_BASE
+ 2;
+ static final int EXIT_CANNOT_DELETE_OLD_DATA = EXIT_BASE + 3;
static final int NUMBER_OF_NODES = 10;
static final short MAX_HTL = 5;
@@ -61,7 +62,10 @@
Logger.globalSetThreshold(Logger.ERROR);
String testName = "realNodeULPRTest";
File wd = new File(testName);
- FileUtil.removeAll(wd);
+ if(!FileUtil.removeAll(wd)) {
+ System.err.println("Mass delete failed, test may not be
accurate.");
+ System.exit(EXIT_CANNOT_DELETE_OLD_DATA);
+ }
wd.mkdir();
DummyRandomSource random = new DummyRandomSource();
@@ -73,7 +77,7 @@
Executor executor = new PooledExecutor();
for(int i=0;i<NUMBER_OF_NODES;i++) {
nodes[i] =
- NodeStarter.createTestNode(5001+i, testName, false, true, true,
MAX_HTL, 20 /* 5% */, random, executor);
+ NodeStarter.createTestNode(5001+i, testName, false, true, true,
MAX_HTL, 20 /* 5% */, random, executor, 500*NUMBER_OF_NODES);
Logger.normal(RealNodeRoutingTest.class, "Created node "+i);
}
SimpleFieldSet refs[] = new SimpleFieldSet[NUMBER_OF_NODES];
