echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Threaded the calling of runRouter() to improve startup times.

Browse Source
This commit is contained in:
dev
2013-06-13 17:02:53 +00:00
parent 29b599bc8d
commit e7718b1fba
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
router/java/src/net/i2p/router/MultiRouter.java
View File

@ -83,12 +83,14 @@ public class MultiRouter {
_defaultContext = new I2PAppContext(buildRouterProps(0)); _defaultContext = new I2PAppContext(buildRouterProps(0));
_defaultContext.clock().setOffset(0); _defaultContext.clock().setOffset(0);
_out.println("RouterConsole for Router 0 is listening on: 127.0.0.1:" + (BASE_PORT-1));
Runtime.getRuntime().addShutdownHook(new Thread() { Runtime.getRuntime().addShutdownHook(new Thread() {
@Override @Override
public void run() { public void run() {
_out.println("Shutting down in a few moments.."); _out.println("Shutting down in a few moments..");
for(Router r : _routers) { for(Router r : _routers) {
r.shutdown(-1); r.shutdown(0);
} }
try { Thread.sleep(1500); } catch (InterruptedException ie) {} try { Thread.sleep(1500); } catch (InterruptedException ie) {}
Runtime.getRuntime().halt(0); Runtime.getRuntime().halt(0);
@ -100,21 +102,34 @@ public class MultiRouter {
router.setKillVMOnEnd(false); router.setKillVMOnEnd(false);
_routers.add(router); _routers.add(router);
_out.println("Router " + i + " was created"); _out.println("Router " + i + " was created");
try { Thread.sleep(100); } catch (InterruptedException ie) {}
} }
for (int i = 0; i < nbrRouters; i++) { for (int i = 0; i < nbrRouters; i++) {
Router r = _routers.get(i); final Router r = _routers.get(i);
long offset = r.getContext().random().nextLong(Router.CLOCK_FUDGE_FACTOR/2); long offset = r.getContext().random().nextLong(Router.CLOCK_FUDGE_FACTOR/2);
if (r.getContext().random().nextBoolean()) if (r.getContext().random().nextBoolean())
offset = 0 - offset; offset = 0 - offset;
r.getContext().clock().setOffset(offset, true); r.getContext().clock().setOffset(offset, true);
r.runRouter();
/* Start the routers in separate threads since it takes some time. */
(new Thread() {
public void run() {
r.runRouter();
}
}).start();
try { Thread.sleep(100); } catch (InterruptedException ie) {}
_out.println("Router " + i + " was started with time offset " + offset); _out.println("Router " + i + " was started with time offset " + offset);
} }
_out.println("All routers have been started"); _out.println("All routers have been started");
/* Wait for routers to start services and generate keys.. */ /* Wait for routers to start services and generate keys
try { Thread.sleep(1000); } catch (InterruptedException ie) {} * before doing the internal reseed. */
int waitForRouters = (nbrRouters/10)*1000;
_out.println("Waiting " + waitForRouters/1000 + " seconds for routers to start" +
"before doing the internal reseed");
try { Thread.sleep(waitForRouters); } catch (InterruptedException ie) {}
internalReseed(); internalReseed();
waitForCompletion(); waitForCompletion();
@ -137,8 +152,8 @@ public class MultiRouter {
private static Properties buildRouterProps(int id) { private static Properties buildRouterProps(int id) {
Properties props = getRouterProps(id); Properties props = getRouterProps(id);
File f = new File(props.getProperty("router.configLocation")); File f = new File(props.getProperty("router.configLocation"));
f.getParentFile().mkdirs();
if (!f.exists()) { if (!f.exists()) {
f.getParentFile().mkdirs();
try { try {
DataHelper.storeProps(props, f); DataHelper.storeProps(props, f);
} catch (IOException e) { } catch (IOException e) {
@ -189,8 +204,8 @@ public class MultiRouter {
Properties rProps = getRouterProps(id); Properties rProps = getRouterProps(id);
Properties props = getClientProps(); Properties props = getClientProps();
File f = new File(rProps.getProperty("router.clientConfigFile")); File f = new File(rProps.getProperty("router.clientConfigFile"));
f.getParentFile().mkdirs();
if (!f.exists()) { if (!f.exists()) {
f.getParentFile().mkdirs();
try { try {
DataHelper.storeProps(props, f); DataHelper.storeProps(props, f);
} catch (IOException e) { } catch (IOException e) {