Author: mrogers
Date: 2006-11-19 10:15:38 +0000 (Sun, 19 Nov 2006)
New Revision: 11002
Modified:
trunk/apps/load-balancing-sims/phase7/sim/Event.java
trunk/apps/load-balancing-sims/phase7/sim/Node.java
trunk/apps/load-balancing-sims/phase7/sim/Sim.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java
Log:
RouteNotFound is not a failure; optionally start logging after waiting for the
initial conditions to settle
Modified: trunk/apps/load-balancing-sims/phase7/sim/Event.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Event.java 2006-11-18
19:01:52 UTC (rev 11001)
+++ trunk/apps/load-balancing-sims/phase7/sim/Event.java 2006-11-19
10:15:38 UTC (rev 11002)
@@ -9,6 +9,7 @@
private static double now = 0.0;
private static double lastLogTime = Double.POSITIVE_INFINITY;
private static int nextId = 0;
+ public static double startLogging = 0.0;
public static double duration = Double.POSITIVE_INFINITY;
public static void reset()
@@ -52,6 +53,7 @@
public static void log (String message)
{
+ if (now < startLogging) return;
// Print a blank line between events
if (now > lastLogTime) System.out.println();
lastLogTime = now;
Modified: trunk/apps/load-balancing-sims/phase7/sim/Node.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Node.java 2006-11-18 19:01:52 UTC
(rev 11001)
+++ trunk/apps/load-balancing-sims/phase7/sim/Node.java 2006-11-19 10:15:38 UTC
(rev 11002)
@@ -294,7 +294,8 @@
private void handleChkRequest (ChkRequest r, Peer prev)
{
- if (USE_BACKOFF && rejectIfOverloaded (prev, r.id)) return;
+ if ((USE_BACKOFF || USE_THROTTLE)
+ && rejectIfOverloaded (prev, r.id)) return;
if (USE_TOKENS && !getToken (prev)) return;
if (rejectIfRecentlySeen (prev, r.id)) return;
// Accept the search
@@ -336,7 +337,8 @@
private void handleChkInsert (ChkInsert i, Peer prev)
{
- if (USE_BACKOFF && rejectIfOverloaded (prev, i.id)) return;
+ if ((USE_BACKOFF || USE_THROTTLE)
+ && rejectIfOverloaded (prev, i.id)) return;
if (USE_TOKENS && !getToken (prev)) return;
if (rejectIfRecentlySeen (prev, i.id)) return;
// Accept the search
@@ -352,7 +354,8 @@
private void handleSskRequest (SskRequest r, Peer prev)
{
- if (USE_BACKOFF && rejectIfOverloaded (prev, r.id)) return;
+ if ((USE_BACKOFF || USE_THROTTLE)
+ && rejectIfOverloaded (prev, r.id)) return;
if (USE_TOKENS && !getToken (prev)) return;
if (rejectIfRecentlySeen (prev, r.id)) return;
// Look up the public key
@@ -402,7 +405,8 @@
private void handleSskInsert (SskInsert i, Peer prev)
{
- if (USE_BACKOFF && rejectIfOverloaded (prev, i.id)) return;
+ if ((USE_BACKOFF || USE_THROTTLE)
+ && rejectIfOverloaded (prev, i.id)) return;
if (USE_TOKENS && !getToken (prev)) return;
if (rejectIfRecentlySeen (prev, i.id)) return;
// Look up the public key
Modified: trunk/apps/load-balancing-sims/phase7/sim/Sim.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Sim.java 2006-11-18 19:01:52 UTC
(rev 11001)
+++ trunk/apps/load-balancing-sims/phase7/sim/Sim.java 2006-11-19 10:15:38 UTC
(rev 11002)
@@ -7,7 +7,6 @@
private final int DEGREE = 5; // Average degree
private final double SPEED = 15000; // Network speed, bytes per second
private final double LATENCY = 0.1; // Latency of all links in seconds
- private final int INSERTS = 100; // Number of inserts per publisher
private Node[] nodes;
public Sim (double rate)
@@ -24,7 +23,7 @@
// One in ten nodes is a publisher, each with ten readers
for (int i = 0; i < NODES; i += 10) {
SimplePublisher pub
- = new SimplePublisher (rate, INSERTS, nodes[i]);
+ = new SimplePublisher (rate, 0, nodes[i]);
int readers = 0;
while (readers < 10) {
int index = (int) (Math.random() * NODES);
@@ -33,6 +32,8 @@
}
}
// Run the simulation
+ Event.startLogging = 3600.0;
+ Event.duration = 7200.0;
Event.run();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java
2006-11-18 19:01:52 UTC (rev 11001)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java
2006-11-19 10:15:38 UTC (rev 11002)
@@ -66,7 +66,7 @@
next = closestPeer();
if (next == null) {
node.log ("route not found for " + this);
- if (prev == null) node.log (this + " failed (rnf)");
+ if (prev == null) node.log (this + " succeeded (rnf)");
else prev.sendMessage (new RouteNotFound (id, htl));
finish();
return;
