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

[mrog...@freenetproject.org]

Author: mrogers
Date: 2006-10-29 21:37:32 +0000 (Sun, 29 Oct 2006)
New Revision: 10742

Modified:
   trunk/apps/load-balancing-sims/phase6/Peer.java
   trunk/apps/load-balancing-sims/phase6/Sim.java
Log:
DataInserts and ChkDataFounds go into the transfer queue to reduce reordering

Modified: trunk/apps/load-balancing-sims/phase6/Peer.java
===================================================================
--- trunk/apps/load-balancing-sims/phase6/Peer.java     2006-10-29 21:17:40 UTC 
(rev 10741)
+++ trunk/apps/load-balancing-sims/phase6/Peer.java     2006-10-29 21:37:32 UTC 
(rev 10742)
@@ -1,9 +1,7 @@
 import java.util.LinkedList;
 import java.util.Iterator;
 import java.util.HashSet;
-import messages.Message;
-import messages.Block;
-import messages.Ack;
+import messages.*;

 class Peer
 {
@@ -31,7 +29,7 @@
        private LinkedList<Packet> txBuffer; // Retransmission buffer
        private DeadlineQueue<Ack> ackQueue; // Outgoing acks
        private DeadlineQueue<Message> searchQueue; // Outgoing search messages
-       private DeadlineQueue<Block> transferQueue; // Outgoing transfers
+       private DeadlineQueue<Message> transferQueue; // Outgoing transfers
        private CongestionWindow window; // AIMD congestion window
        private double lastTransmission = 0.0; // Clock time
        private boolean tgif = false; // "Transfers go in first" toggle
@@ -49,7 +47,7 @@
                txBuffer = new LinkedList<Packet>();
                ackQueue = new DeadlineQueue<Ack>();
                searchQueue = new DeadlineQueue<Message>();
-               transferQueue = new DeadlineQueue<Block>();
+               transferQueue = new DeadlineQueue<Message>();
                window = new CongestionWindow (this);
                rxDupe = new HashSet<Integer>();
        }
@@ -57,9 +55,10 @@
        // Queue a message for transmission
        public void sendMessage (Message m)
        {
-               if (m instanceof Block) {
+               if (m instanceof Block || m instanceof DataInsert
+               || m instanceof ChkDataFound) {
                        log (m + " added to transfer queue");
-                       transferQueue.add ((Block) m, Event.time() + MAX_DELAY);
+                       transferQueue.add (m, Event.time() + MAX_DELAY);
                }
                else {
                        log (m + " added to search queue");

Modified: trunk/apps/load-balancing-sims/phase6/Sim.java
===================================================================
--- trunk/apps/load-balancing-sims/phase6/Sim.java      2006-10-29 21:17:40 UTC 
(rev 10741)
+++ trunk/apps/load-balancing-sims/phase6/Sim.java      2006-10-29 21:37:32 UTC 
(rev 10742)
@@ -20,13 +20,13 @@

                int key = Node.locationToKey (Math.random());
                Event.schedule (nodes[0], 0.0,
-                       Node.GENERATE_SSK_INSERT, key);
+                       Node.GENERATE_CHK_INSERT, key);
                Event.schedule (nodes[NODES/4], 30.0,
-                       Node.GENERATE_SSK_REQUEST, key);
+                       Node.GENERATE_CHK_REQUEST, key);
                Event.schedule (nodes[NODES/2], 60.0,
-                       Node.GENERATE_SSK_COLLISION, key);
+                       Node.GENERATE_CHK_INSERT, key);
                Event.schedule (nodes[3*NODES/4], 90.0,
-                       Node.GENERATE_SSK_REQUEST, key);
+                       Node.GENERATE_CHK_REQUEST, key);

                // Run the simulation
                Event.run();