Author: toad
Date: 2008-09-13 19:42:52 +0000 (Sat, 13 Sep 2008)
New Revision: 22644
Modified:
trunk/freenet/src/freenet/node/NodeStarter.java
trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeBusyNetworkTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.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/RealNodeSecretPingTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
Log:
Don't turn off DNS lookups for network tests. Only turn them off for actual
simulations.
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2008-09-13 19:01:25 UTC
(rev 22643)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2008-09-13 19:42:52 UTC
(rev 22644)
@@ -261,7 +261,7 @@
* Not Node-specific; many nodes may be created later.
* @param testName The name of the test instance.
*/
- public static RandomSource globalTestInit(String testName, boolean
enablePlug, int logThreshold, String details) throws InvalidThresholdException {
+ public static RandomSource globalTestInit(String testName, boolean
enablePlug, int logThreshold, String details, boolean noDNS) throws
InvalidThresholdException {
File dir = new File(testName);
if((!dir.mkdir()) && ((!dir.exists()) || (!dir.isDirectory())))
{
@@ -316,7 +316,7 @@
}
FNPPacketMangler.LOG_UNMATCHABLE_ERROR = true;
- DNSRequester.DISABLE = true;
+ DNSRequester.DISABLE = noDNS;
return random;
}
Modified: trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -62,7 +62,7 @@
ipOverride = args[0];
File dir = new File("bootstrap-pull-test");
FileUtil.removeAll(dir);
- RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false,
Logger.ERROR, "");
+ RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false,
Logger.ERROR, "", false);
byte[] seed = new byte[64];
random.nextBytes(seed);
MersenneTwister fastRandom = new MersenneTwister(seed);
Modified: trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -43,7 +43,7 @@
ipOverride = args[0];
File dir = new File("bootstrap-push-pull-test");
FileUtil.removeAll(dir);
- RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false,
Logger.ERROR, "");
+ RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false,
Logger.ERROR, "", false);
File seednodes = new File("seednodes.fref");
if(!seednodes.exists() || seednodes.length() == 0 ||
!seednodes.canRead()) {
System.err.println("Unable to read seednodes.fref, it doesn't
exist, or is empty");
Modified: trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -37,7 +37,7 @@
ipOverride = args[0];
File dir = new File("bootstrap-test");
FileUtil.removeAll(dir);
- RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false,
Logger.ERROR, "");
+ RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false,
Logger.ERROR, "", false);
File seednodes = new File("seednodes.fref");
if(!seednodes.exists() || seednodes.length() == 0 ||
!seednodes.canRead()) {
System.err.println("Unable to read seednodes.fref, it doesn't
exist, or is empty");
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeBusyNetworkTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeBusyNetworkTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeBusyNetworkTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -65,7 +65,7 @@
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNode:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR");
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.Location:MINOR,freenet.io.comm:MINOR,freenet.node.NodeDispatcher:MINOR,freenet.node.simulator:MINOR,freenet.node.PeerManager:MINOR,freenet.node.RequestSender:MINOR");
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.FNP:MINOR,freenet.node.Packet:MINOR,freenet.io.comm:MINOR,freenet.node.PeerNode:MINOR,freenet.node.DarknetPeerNode:MINOR");
- NodeStarter.globalTestInit(name, false, Logger.ERROR, "");
+ NodeStarter.globalTestInit(name, false, Logger.ERROR, "", true);
System.out.println("Busy network test (inserts/retrieves in
quantity/stress test)");
System.out.println();
DummyRandomSource random = new DummyRandomSource();
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -54,7 +54,7 @@
String wd = "realNodeNetworkColorTest";
new File(wd).mkdir();
//NOTE: globalTestInit returns in ignored random source
- NodeStarter.globalTestInit(wd, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeNetworkColoringTest:normal,freenet.node.NetworkIDManager:normal");
+ NodeStarter.globalTestInit(wd, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeNetworkColoringTest:normal,freenet.node.NetworkIDManager:normal",
true);
DummyRandomSource random = new DummyRandomSource();
//DiffieHellman.init(random);
Modified: trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodePingTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -30,7 +30,7 @@
public class RealNodePingTest {
public static void main(String[] args) throws FSParseException,
PeerParseException, InterruptedException,
ReferenceSignatureVerificationException, NodeInitException,
InvalidThresholdException {
- RandomSource random = NodeStarter.globalTestInit("pingtest", false,
Logger.ERROR, "");
+ RandomSource random = NodeStarter.globalTestInit("pingtest", false,
Logger.ERROR, "", true);
// Create 2 nodes
Executor executor = new PooledExecutor();
Node node1 = NodeStarter.createTestNode(5001, 0, "pingtest", false,
false, true, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000, 65536, true,
false, false, false, false, false, true, 0, false, false, null);
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -64,7 +64,7 @@
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNode:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR");
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.Location:MINOR,freenet.io.comm:MINOR,freenet.node.NodeDispatcher:MINOR,freenet.node.simulator:MINOR,freenet.node.PeerManager:MINOR,freenet.node.RequestSender:MINOR");
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.FNP:MINOR,freenet.node.Packet:MINOR,freenet.io.comm:MINOR,freenet.node.PeerNode:MINOR,freenet.node.DarknetPeerNode:MINOR");
- NodeStarter.globalTestInit(name, false, Logger.ERROR, "");
+ NodeStarter.globalTestInit(name, false, Logger.ERROR, "", true);
System.out.println("Insert/retrieve test");
System.out.println();
DummyRandomSource random = new DummyRandomSource();
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -48,7 +48,7 @@
}
wd.mkdir();
//NOTE: globalTestInit returns in ignored random source
- NodeStarter.globalTestInit(dir, false, Logger.ERROR, "");
+ NodeStarter.globalTestInit(dir, false, Logger.ERROR, "", true);
DummyRandomSource random = new DummyRandomSource();
//DiffieHellman.init(random);
Node[] nodes = new Node[NUMBER_OF_NODES];
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeSecretPingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeSecretPingTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeSecretPingTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -52,7 +52,7 @@
String wd = "realNodeSecretPingTest";
new File(wd).mkdir();
//NOTE: globalTestInit returns in ignored random source
- NodeStarter.globalTestInit(wd, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeSecretPingTest:normal,freenet.node.NetworkIDManager:normal");
+ NodeStarter.globalTestInit(wd, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeSecretPingTest:normal,freenet.node.NetworkIDManager:normal",
true);
DummyRandomSource random = new DummyRandomSource();
//DiffieHellman.init(random);
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -87,7 +87,7 @@
//NOTE: globalTestInit returns in ignored random source
//NodeStarter.globalTestInit(testName, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeRoutingTest:normal,freenet.node.NodeDispatcher:NORMAL"
/*,freenet.node.FailureTable:MINOR,freenet.node.Node:MINOR,freenet.node.Request:MINOR,freenet.io.comm.MessageCore:MINOR"
"freenet.store:minor,freenet.node.LocationManager:debug,freenet.node.FNPPacketManager:normal,freenet.io.comm.MessageCore:debug"*/);
- NodeStarter.globalTestInit(testName, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeRoutingTest:normal,freenet.node.NodeDispatcher:NORMAL,freenet.node.FailureTable:MINOR,freenet.node.Node:MINOR,freenet.node.Request:MINOR,freenet.io.comm.MessageCore:MINOR,freenet.node.PeerNode:MINOR,freenet.io.xfer.PacketThrottle:MINOR,freenet.node.PeerManager:MINOR");
+ NodeStarter.globalTestInit(testName, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNodeRoutingTest:normal,freenet.node.NodeDispatcher:NORMAL,freenet.node.FailureTable:MINOR,freenet.node.Node:MINOR,freenet.node.Request:MINOR,freenet.io.comm.MessageCore:MINOR,freenet.node.PeerNode:MINOR,freenet.io.xfer.PacketThrottle:MINOR,freenet.node.PeerManager:MINOR",
true);
Node[] nodes = new Node[NUMBER_OF_NODES];
Logger.normal(RealNodeRoutingTest.class, "Creating nodes...");
Executor executor = new PooledExecutor();
Modified: trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
2008-09-13 19:01:25 UTC (rev 22643)
+++ trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
2008-09-13 19:42:52 UTC (rev 22644)
@@ -47,7 +47,7 @@
try {
if(args.length == 1)
STATUS_DIR = new File(args[0]);
- RandomSource random = NodeStarter.globalTestInit("seednode-pingtest",
false, Logger.ERROR, "");
+ RandomSource random = NodeStarter.globalTestInit("seednode-pingtest",
false, Logger.ERROR, "", false);
// Create one node
Executor executor = new PooledExecutor();
node = NodeStarter.createTestNode(5000, 5001, "seednode-pingtest",
true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000,
5*1024*1024, true, false, false, false, false, false, false, 0, false, false,
null);
