Author: mrogers
Date: 2006-11-17 22:52:53 +0000 (Fri, 17 Nov 2006)
New Revision: 10976
Modified:
trunk/apps/load-balancing-sims/phase7/sim/Node.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java
Log:
Subclass variable with the same name as superclass variable - shoot me
Modified: trunk/apps/load-balancing-sims/phase7/sim/Node.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Node.java 2006-11-17 20:35:49 UTC
(rev 10975)
+++ trunk/apps/load-balancing-sims/phase7/sim/Node.java 2006-11-17 22:52:53 UTC
(rev 10976)
@@ -14,7 +14,7 @@
// Flow control
public final static boolean USE_TOKENS = false;
- public final static boolean USE_BACKOFF = false;
+ public final static boolean USE_BACKOFF = true;
public final static boolean USE_THROTTLE = true;
public final static int FLOW_TOKENS = 20; // Shared by all peers
public final static double TOKEN_DELAY = 1.0; // Allocate initial tokens
Modified:
trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java
2006-11-17 20:35:49 UTC (rev 10975)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java
2006-11-17 22:52:53 UTC (rev 10976)
@@ -27,9 +27,7 @@
public void handleMessage (Message m, Peer src)
{
- if (m instanceof RejectedOverload)
- handleOverload ((RejectedOverload) m, src);
- else if (src == prev) {
+ if (src == prev) {
if (m instanceof DataInsert)
handleDataInsert ((DataInsert) m);
else if (m instanceof Block)
@@ -41,6 +39,8 @@
handleAccepted ((Accepted) m);
else if (m instanceof RejectedLoop)
handleRejectedLoop ((RejectedLoop) m);
+ else if (m instanceof RejectedOverload)
+ handleOverload ((RejectedOverload) m, src);
else if (m instanceof RouteNotFound)
handleRouteNotFound ((RouteNotFound) m);
else if (m instanceof InsertReply)
Modified:
trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java
2006-11-17 20:35:49 UTC (rev 10975)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java
2006-11-17 22:52:53 UTC (rev 10976)
@@ -17,14 +17,14 @@
public void handleMessage (Message m, Peer src)
{
- if (m instanceof RejectedOverload)
- handleOverload ((RejectedOverload) m, src);
- else if (src != next)
+ if (src != next)
node.log ("unexpected source for " + m);
else if (m instanceof Accepted)
handleAccepted ((Accepted) m);
else if (m instanceof RejectedLoop)
handleRejectedLoop ((RejectedLoop) m);
+ else if (m instanceof RejectedOverload)
+ handleOverload ((RejectedOverload) m, src);
else if (m instanceof RouteNotFound)
handleRouteNotFound ((RouteNotFound) m);
else if (m instanceof DataNotFound)
Modified:
trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java
2006-11-17 20:35:49 UTC (rev 10975)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java
2006-11-17 22:52:53 UTC (rev 10976)
@@ -7,7 +7,6 @@
public class SskInsertHandler extends MessageHandler implements EventTarget
{
- private int searchState = STARTED; // searchState of search
private SskPubKey pubKey = null;
private int data; // The data being inserted
@@ -47,9 +46,7 @@
public void handleMessage (Message m, Peer src)
{
- if (m instanceof RejectedOverload)
- handleOverload ((RejectedOverload) m, src);
- else if (src == prev) {
+ if (src == prev) {
if (m instanceof SskPubKey)
handleSskPubKey ((SskPubKey) m);
else node.log ("unexpected type for " + m);
@@ -59,6 +56,8 @@
handleSskAccepted ((SskAccepted) m);
else if (m instanceof RejectedLoop)
handleRejectedLoop ((RejectedLoop) m);
+ else if (m instanceof RejectedOverload)
+ handleOverload ((RejectedOverload) m, src);
else if (m instanceof RouteNotFound)
handleRouteNotFound ((RouteNotFound) m);
else if (m instanceof SskDataFound)
Modified:
trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java
2006-11-17 20:35:49 UTC (rev 10975)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java
2006-11-17 22:52:53 UTC (rev 10976)
@@ -20,14 +20,14 @@
public void handleMessage (Message m, Peer src)
{
- if (m instanceof RejectedOverload)
- handleOverload ((RejectedOverload) m, src);
- else if (src != next)
+ if (src != next)
node.log ("unexpected source for " + m);
else if (m instanceof Accepted)
handleAccepted ((Accepted) m);
else if (m instanceof RejectedLoop)
handleRejectedLoop ((RejectedLoop) m);
+ else if (m instanceof RejectedOverload)
+ handleOverload ((RejectedOverload) m, src);
else if (m instanceof RouteNotFound)
handleRouteNotFound ((RouteNotFound) m);
else if (m instanceof DataNotFound)
