[freenet-cvs] r10460 - trunk/apps/load-balancing-sims/phase6

[mrog...@freenetproject.org]

Author: mrogers
Date: 2006-09-12 19:52:08 +0000 (Tue, 12 Sep 2006)
New Revision: 10460

Modified:
   trunk/apps/load-balancing-sims/phase6/ChkRequestHandler.java
   trunk/apps/load-balancing-sims/phase6/Peer.java
   trunk/apps/load-balancing-sims/phase6/Sim.java
Log:
Don't send empty packets (when did I remove this check?)

Modified: trunk/apps/load-balancing-sims/phase6/ChkRequestHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase6/ChkRequestHandler.java        
2006-09-12 19:20:52 UTC (rev 10459)
+++ trunk/apps/load-balancing-sims/phase6/ChkRequestHandler.java        
2006-09-12 19:52:08 UTC (rev 10460)
@@ -64,7 +64,6 @@
                else if (m instanceof RouteNotFound)
                        handleRouteNotFound ((RouteNotFound) m);
                else if (m instanceof Block) handleBlock ((Block) m);
-               else if (m instanceof RouteNotFound) forwardRequest();
                else if (m instanceof RejectedLoop) forwardRequest();
                else node.log ("unexpected type for " + m);
        }
@@ -100,7 +99,6 @@
                if (state != ACCEPTED) node.log (rnf + " out of order");
                if (rnf.htl < htl) htl = rnf.htl;
                // Use the remaining htl to try another peer
-               nexts.remove (next);
                forwardRequest();
        }


Modified: trunk/apps/load-balancing-sims/phase6/Peer.java
===================================================================
--- trunk/apps/load-balancing-sims/phase6/Peer.java     2006-09-12 19:20:52 UTC 
(rev 10459)
+++ trunk/apps/load-balancing-sims/phase6/Peer.java     2006-09-12 19:52:08 UTC 
(rev 10460)
@@ -122,6 +122,9 @@
                        log ("no bandwidth available for messages");
                else pack (p); // OK to send data

+               // Don't send empty packets
+               if (p.acks == null && p.messages == null) return false;
+               
                // If the packet contains data, buffer it for retransmission
                if (p.messages != null) {
                        p.seq = txSeq++;

Modified: trunk/apps/load-balancing-sims/phase6/Sim.java
===================================================================
--- trunk/apps/load-balancing-sims/phase6/Sim.java      2006-09-12 19:20:52 UTC 
(rev 10459)
+++ trunk/apps/load-balancing-sims/phase6/Sim.java      2006-09-12 19:52:08 UTC 
(rev 10460)
@@ -25,7 +25,7 @@
                n2.connectBothWays (n3, 0.1);
                n3.connectBothWays (n4, 0.1);

-               for (int i = 0; i < 2; i++) {
+               for (int i = 0; i < 10; i++) {
                        int key = Node.locationToKey (Math.random());
                        if (i % 2 == 0) n4.cacheChk (key);
                        Event.schedule (n0, 0.0, Node.GENERATE_REQUEST, key);