Author: mrogers
Date: 2006-12-13 14:05:05 +0000 (Wed, 13 Dec 2006)
New Revision: 11371
Added:
trunk/apps/load-balancing-sims/phase7/sim/clients/
trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java
trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
Removed:
trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
trunk/apps/load-balancing-sims/phase7/sim/generators/
Log:
Don't inform the readers until the insert starts (plus ten minutes)
Copied: trunk/apps/load-balancing-sims/phase7/sim/clients (from rev 11363,
trunk/apps/load-balancing-sims/phase7/sim/generators)
Copied: trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java (from rev
11370, trunk/apps/load-balancing-sims/phase7/sim/generators/Client.java)
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java
(rev 0)
+++ trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java
2006-12-13 14:05:05 UTC (rev 11371)
@@ -0,0 +1,7 @@
+package sim.generators;
+import sim.messages.Search;
+
+public interface Client
+{
+ public void searchStarted (Search s); // Callback
+}
Deleted: trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/generators/SimplePublisher.java
2006-12-12 17:31:40 UTC (rev 11363)
+++ trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
2006-12-13 14:05:05 UTC (rev 11371)
@@ -1,83 +0,0 @@
-// A simple publisher that inserts keys using a Poisson process and informs
-// each reader after an average of ten minutes
-
-package sim.generators;
-import sim.Event;
-import sim.EventTarget;
-import sim.Node;
-import java.util.HashSet;
-
-public class SimplePublisher implements EventTarget
-{
- // FIXME: what fraction of keys are CHKs in real life?
- private final static double FRACTION_CHKS = 0.5;
-
- public final double rate; // Inserts per second
- private int inserts; // Publish this many inserts (0 for unlimited)
- private Node node; // The publisher's node
- private HashSet<Node> readers; // The readers' nodes
-
- public SimplePublisher (double rate, int inserts, Node node)
- {
- this.rate = rate;
- this.inserts = inserts;
- this.node = node;
- readers = new HashSet<Node>();
- // Schedule the first insert
- double delay = -Math.log (Math.random()) / rate;
- Event.schedule (this, delay, PUBLISH, null);
- }
-
- public boolean addReader (Node n)
- {
- return readers.add (n);
- }
-
- private void publish()
- {
- // Randomly choose between publishing a CHK and an SSK
- if (Math.random() < FRACTION_CHKS) publishChk();
- else publishSsk();
- }
-
- private void publishChk()
- {
- // Insert a random key
- int key = Node.locationToKey (Math.random());
- node.generateChkInsert (key);
- // Inform each reader after an average of ten minutes
- for (Node n : readers) {
- double delay = 595.0 + Math.random() * 10.0;
- Event.schedule (n, delay, Node.REQUEST_CHK, key);
- }
- // Schedule the next insert after an exp. distributed delay
- if (inserts > 0 && --inserts == 0) return;
- double delay = -Math.log (Math.random()) / rate;
- Event.schedule (this, delay, PUBLISH, null);
- }
-
- private void publishSsk()
- {
- // Insert a random key
- int key = Node.locationToKey (Math.random());
- node.generateSskInsert (key, 0);
- // Inform each reader after an average of ten minutes
- for (Node n : readers) {
- double delay = 595.0 + Math.random() * 10.0;
- Event.schedule (n, delay, Node.REQUEST_SSK, key);
- }
- // Schedule the next insert after an exp. distributed delay
- if (inserts > 0 && --inserts == 0) return;
- double delay = -Math.log (Math.random()) / rate;
- Event.schedule (this, delay, PUBLISH, null);
- }
-
- // EventTarget interface
-
- public void handleEvent (int type, Object data)
- {
- if (type == PUBLISH) publish();
- }
-
- private final static int PUBLISH = 1;
-}
Copied: trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
(from rev 11370,
trunk/apps/load-balancing-sims/phase7/sim/generators/SimplePublisher.java)
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
(rev 0)
+++ trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
2006-12-13 14:05:05 UTC (rev 11371)
@@ -0,0 +1,88 @@
+// A simple publisher that inserts keys using a Poisson process and informs
+// each reader after an average of ten minutes
+
+package sim.generators;
+import sim.Event;
+import sim.EventTarget;
+import sim.Node;
+import sim.messages.*;
+import java.util.HashSet;
+
+public class SimplePublisher implements Client, EventTarget
+{
+ // FIXME: what fraction of keys are CHKs in real life?
+ private final static double FRACTION_CHKS = 0.5;
+
+ public final double rate; // Inserts per second
+ private int inserts; // Publish this many inserts (0 for unlimited)
+ private Node node; // The publisher's node
+ private HashSet<Node> readers; // The readers' nodes
+
+ public SimplePublisher (double rate, int inserts, Node node)
+ {
+ this.rate = rate;
+ this.inserts = inserts;
+ this.node = node;
+ readers = new HashSet<Node>();
+ // Schedule the first insert
+ double delay = -Math.log (Math.random()) / rate;
+ Event.schedule (this, delay, PUBLISH, null);
+ }
+
+ public boolean addReader (Node n)
+ {
+ return readers.add (n);
+ }
+
+ private void publish()
+ {
+ // Randomly choose between publishing a CHK and an SSK
+ if (Math.random() < FRACTION_CHKS) publishChk();
+ else publishSsk();
+ }
+
+ private void publishChk()
+ {
+ // Insert a random key
+ int key = Node.locationToKey (Math.random());
+ node.generateChkInsert (key, this);
+ // Schedule the next insert after an exp. distributed delay
+ if (inserts > 0 && --inserts == 0) return;
+ double delay = -Math.log (Math.random()) / rate;
+ Event.schedule (this, delay, PUBLISH, null);
+ }
+
+ private void publishSsk()
+ {
+ // Insert a random key
+ int key = Node.locationToKey (Math.random());
+ node.generateSskInsert (key, 0, this);
+ // Schedule the next insert after an exp. distributed delay
+ if (inserts > 0 && --inserts == 0) return;
+ double delay = -Math.log (Math.random()) / rate;
+ Event.schedule (this, delay, PUBLISH, null);
+ }
+
+ // Client interface
+
+ public void searchStarted (Search s)
+ {
+ // Inform each reader after an average of ten minutes
+ for (Node n : readers) {
+ double d = 595.0 + Math.random() * 10.0;
+ if (s instanceof ChkInsert)
+ Event.schedule (n, d, Node.REQUEST_CHK, s.key);
+ else if (s instanceof SskInsert)
+ Event.schedule (n, d, Node.REQUEST_SSK, s.key);
+ }
+ }
+
+ // EventTarget interface
+
+ public void handleEvent (int type, Object data)
+ {
+ if (type == PUBLISH) publish();
+ }
+
+ private final static int PUBLISH = 1;
+}
