[freenet-cvs] r18291 - in trunk/apps/load-balancing-sims/phase7: . sim sim/clients sim/handlers sim/messages
mrogers at freenetproject.org
mrogers at freenetproject.org
Sat Mar 1 18:41:41 UTC 2008
Author: mrogers
Date: 2008-03-01 18:41:40 +0000 (Sat, 01 Mar 2008)
New Revision: 18291
Modified:
trunk/apps/load-balancing-sims/phase7/choplog
trunk/apps/load-balancing-sims/phase7/sim/CongestionWindow.java
trunk/apps/load-balancing-sims/phase7/sim/DeadlineQueue.java
trunk/apps/load-balancing-sims/phase7/sim/Event.java
trunk/apps/load-balancing-sims/phase7/sim/EventTarget.java
trunk/apps/load-balancing-sims/phase7/sim/LruCache.java
trunk/apps/load-balancing-sims/phase7/sim/LruMap.java
trunk/apps/load-balancing-sims/phase7/sim/Network.java
trunk/apps/load-balancing-sims/phase7/sim/NetworkInterface.java
trunk/apps/load-balancing-sims/phase7/sim/Node.java
trunk/apps/load-balancing-sims/phase7/sim/Packet.java
trunk/apps/load-balancing-sims/phase7/sim/Peer.java
trunk/apps/load-balancing-sims/phase7/sim/SearchThrottle.java
trunk/apps/load-balancing-sims/phase7/sim/Sim.java
trunk/apps/load-balancing-sims/phase7/sim/TokenBucket.java
trunk/apps/load-balancing-sims/phase7/sim/TokenTest.java
trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java
trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.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/MessageHandler.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/RequestHandler.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java
trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java
trunk/apps/load-balancing-sims/phase7/sim/messages/Accepted.java
trunk/apps/load-balancing-sims/phase7/sim/messages/Block.java
trunk/apps/load-balancing-sims/phase7/sim/messages/ChkDataFound.java
trunk/apps/load-balancing-sims/phase7/sim/messages/ChkInsert.java
trunk/apps/load-balancing-sims/phase7/sim/messages/ChkRequest.java
trunk/apps/load-balancing-sims/phase7/sim/messages/DataInsert.java
trunk/apps/load-balancing-sims/phase7/sim/messages/DataNotFound.java
trunk/apps/load-balancing-sims/phase7/sim/messages/InsertReply.java
trunk/apps/load-balancing-sims/phase7/sim/messages/Message.java
trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedLoop.java
trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedOverload.java
trunk/apps/load-balancing-sims/phase7/sim/messages/RouteNotFound.java
trunk/apps/load-balancing-sims/phase7/sim/messages/Search.java
trunk/apps/load-balancing-sims/phase7/sim/messages/SskAccepted.java
trunk/apps/load-balancing-sims/phase7/sim/messages/SskDataFound.java
trunk/apps/load-balancing-sims/phase7/sim/messages/SskInsert.java
trunk/apps/load-balancing-sims/phase7/sim/messages/SskPubKey.java
trunk/apps/load-balancing-sims/phase7/sim/messages/SskRequest.java
trunk/apps/load-balancing-sims/phase7/sim/messages/Token.java
trunk/apps/load-balancing-sims/phase7/sim/messages/TransfersCompleted.java
Log:
Copyright messages (finally!) and a few cleanups
Modified: trunk/apps/load-balancing-sims/phase7/choplog
===================================================================
--- trunk/apps/load-balancing-sims/phase7/choplog 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/choplog 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# This software has been placed in the public domain by its author
while (<STDIN>) {
split ' ';
print unless ($_[0] < $ARGV[0]);
Modified: trunk/apps/load-balancing-sims/phase7/sim/CongestionWindow.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/CongestionWindow.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/CongestionWindow.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// AIMD congestion control
package sim;
Modified: trunk/apps/load-balancing-sims/phase7/sim/DeadlineQueue.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/DeadlineQueue.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/DeadlineQueue.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// A queue storing outgoing messages and their coalescing deadlines
package sim;
Modified: trunk/apps/load-balancing-sims/phase7/sim/Event.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Event.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/Event.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
import java.util.TreeSet; // Gotta love the collections framework...
@@ -7,8 +9,8 @@
private static TreeSet<Event> queue = new TreeSet<Event>();
private static double now = 0.0;
- private static double lastLogTime = Double.POSITIVE_INFINITY;
- private static int nextId = 0;
+ private static int nextId = 0, currentId = -1, lastLogId = -1;
+ private static int nextCode = 0; // Unique event codes
public static double duration = Double.POSITIVE_INFINITY;
public static boolean blankLine = false; // Blank line between events?
@@ -16,15 +18,16 @@
{
queue.clear();
now = 0.0;
- lastLogTime = Double.POSITIVE_INFINITY;
nextId = 0;
+ currentId = -1;
+ lastLogId = -1;
duration = Double.POSITIVE_INFINITY;
}
public static void schedule (EventTarget target, double delay,
- int type, Object data)
+ int code, Object data)
{
- queue.add (new Event (target, delay + now, type, data));
+ queue.add (new Event (target, delay + now, code, data));
}
public static boolean nextEvent()
@@ -39,8 +42,9 @@
// Update the clock
now = e.time;
// Pass the packet to the target's callback method
+ currentId = e.id;
queue.remove (e);
- e.target.handleEvent (e.type, e.data);
+ e.target.handleEvent (e.code, e.data);
return true;
}
catch (java.util.NoSuchElementException x) {
@@ -54,11 +58,16 @@
return now;
}
+ public static int code()
+ {
+ return nextCode++;
+ }
+
public static void log (String message)
{
// Print a blank line between events
- if (blankLine && now > lastLogTime) System.out.println();
- lastLogTime = now;
+ if (blankLine && currentId > lastLogId) System.out.println();
+ lastLogId = currentId;
System.out.print (now + " " + message + "\n");
}
@@ -73,14 +82,14 @@
private EventTarget target;
private double time;
private int id;
- private int type;
+ private int code;
private Object data;
- private Event (EventTarget target, double time, int type, Object data)
+ private Event (EventTarget target, double time, int code, Object data)
{
this.target = target;
this.time = time;
- this.type = type;
+ this.code = code;
this.data = data;
id = nextId++;
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/EventTarget.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/EventTarget.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/EventTarget.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
public interface EventTarget
@@ -2,3 +4,3 @@
{
- public void handleEvent (int type, Object data);
+ public void handleEvent (int code, Object data);
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/LruCache.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/LruCache.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/LruCache.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// Limited-capacity LRU cache
package sim;
Modified: trunk/apps/load-balancing-sims/phase7/sim/LruMap.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/LruMap.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/LruMap.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// Limited-capacity LRU cache that stores a value for each key
package sim;
Modified: trunk/apps/load-balancing-sims/phase7/sim/Network.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Network.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/Network.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
import java.util.HashMap;
Modified: trunk/apps/load-balancing-sims/phase7/sim/NetworkInterface.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/NetworkInterface.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/NetworkInterface.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// A node's low-level network interface
package sim;
@@ -104,24 +106,14 @@
}
// EventTarget interface
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- switch (type) {
- case RX_QUEUE:
- rxQueueAdd ((Packet) data);
- break;
-
- case RX_END:
- rxEnd ((Packet) data);
- break;
-
- case TX_END:
- txEnd ((Packet) data);
- break;
- }
+ if (code == RX_QUEUE) rxQueueAdd ((Packet) data);
+ else if (code == RX_END) rxEnd ((Packet) data);
+ else if (code == TX_END) txEnd ((Packet) data);
}
- public final static int RX_QUEUE = 1;
- private final static int RX_END = 2;
- private final static int TX_END = 3;
+ public final static int RX_QUEUE = Event.code();
+ private final static int RX_END = Event.code();
+ private final static int TX_END = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/Node.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Node.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/Node.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
import sim.clients.Client;
import sim.handlers.*;
@@ -636,49 +638,32 @@
}
// EventTarget interface
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- switch (type) {
- case REQUEST_CHK:
+ if (code == REQUEST_CHK)
generateChkRequest ((Integer) data);
- break;
-
- case INSERT_CHK:
+ else if (code == INSERT_CHK)
generateChkInsert ((Integer) data, null);
- break;
-
- case REQUEST_SSK:
+ else if (code == REQUEST_SSK)
generateSskRequest ((Integer) data);
- break;
-
- case INSERT_SSK:
+ else if (code == INSERT_SSK)
generateSskInsert ((Integer) data, 0, null);
- break;
-
- case SSK_COLLISION:
+ else if (code == SSK_COLLISION)
generateSskInsert ((Integer) data, 1, null);
- break;
-
- case ALLOCATE_TOKENS:
+ else if (code == ALLOCATE_TOKENS)
allocateTokens();
- break;
-
- case SEND_SEARCH:
+ else if (code == SEND_SEARCH)
sendSearch();
- break;
-
- case TIMER:
+ else if (code == TIMER)
timer();
- break;
- }
}
- public final static int REQUEST_CHK = 1;
- public final static int INSERT_CHK = 2;
- public final static int REQUEST_SSK = 3;
- public final static int INSERT_SSK = 4;
- public final static int SSK_COLLISION = 5;
- private final static int ALLOCATE_TOKENS = 6;
- private final static int SEND_SEARCH = 7;
- private final static int TIMER = 8;
+ public final static int REQUEST_CHK = Event.code();
+ public final static int INSERT_CHK = Event.code();
+ public final static int REQUEST_SSK = Event.code();
+ public final static int INSERT_SSK = Event.code();
+ public final static int SSK_COLLISION = Event.code();
+ private final static int ALLOCATE_TOKENS = Event.code();
+ private final static int SEND_SEARCH = Event.code();
+ private final static int TIMER = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/Packet.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Packet.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/Packet.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// A low-level packet (as opposed to a high-level message)
package sim;
Modified: trunk/apps/load-balancing-sims/phase7/sim/Peer.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Peer.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/Peer.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
import sim.messages.*;
import java.util.LinkedList;
Modified: trunk/apps/load-balancing-sims/phase7/sim/SearchThrottle.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/SearchThrottle.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/SearchThrottle.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// An AIMD leaky bucket
package sim;
Modified: trunk/apps/load-balancing-sims/phase7/sim/Sim.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/Sim.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/Sim.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
import sim.clients.SimplePublisher;
@@ -92,14 +94,14 @@
new Sim().run (load / 60.0);
}
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- if (type == RESET_COUNTERS) {
+ if (code == RESET_COUNTERS) {
Node.succeededLocally = 0;
Node.succeededRemotely = 0;
Node.failed = 0;
}
}
- private final static int RESET_COUNTERS = 1;
+ private final static int RESET_COUNTERS = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/TokenBucket.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/TokenBucket.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/TokenBucket.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
class TokenBucket
Modified: trunk/apps/load-balancing-sims/phase7/sim/TokenTest.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/TokenTest.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/TokenTest.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim;
class TokenTest
Modified: trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/clients/Client.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.clients;
import sim.messages.Search;
Modified: trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/clients/SimplePublisher.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// A simple publisher that inserts keys using a Poisson process and informs
// each reader after an average of ten minutes
@@ -79,10 +81,10 @@
// EventTarget interface
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- if (type == PUBLISH) publish();
+ if (code == PUBLISH) publish();
}
- private final static int PUBLISH = 1;
+ private final static int PUBLISH = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkInsertHandler.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// The state of a CHK insert as stored at each node along the path
package sim.handlers;
@@ -206,34 +208,23 @@
}
// EventTarget interface
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- switch (type) {
- case ACCEPTED_TIMEOUT:
+ if (code == ACCEPTED_TIMEOUT)
acceptedTimeout ((Peer) data);
- break;
-
- case SEARCH_TIMEOUT:
+ else if (code == SEARCH_TIMEOUT)
searchTimeout ((Peer) data);
- break;
-
- case DATA_TIMEOUT:
+ else if (code == DATA_TIMEOUT)
dataTimeout();
- break;
-
- case TRANSFER_IN_TIMEOUT:
+ else if (code == TRANSFER_IN_TIMEOUT)
transferInTimeout();
- break;
-
- case TRANSFER_OUT_TIMEOUT:
+ else if (code == TRANSFER_OUT_TIMEOUT)
transferOutTimeout ((Peer) data);
- break;
- }
}
- private final static int ACCEPTED_TIMEOUT = 1;
- private final static int SEARCH_TIMEOUT = 2;
- private final static int DATA_TIMEOUT = 3;
- private final static int TRANSFER_IN_TIMEOUT = 4;
- private final static int TRANSFER_OUT_TIMEOUT = 5;
+ private final static int ACCEPTED_TIMEOUT = Event.code();
+ private final static int SEARCH_TIMEOUT = Event.code();
+ private final static int DATA_TIMEOUT = Event.code();
+ private final static int TRANSFER_IN_TIMEOUT = Event.code();
+ private final static int TRANSFER_OUT_TIMEOUT = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/ChkRequestHandler.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// The state of a CHK request as stored at each node along the path
package sim.handlers;
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/MessageHandler.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// The state of a search as stored at each node along the path
package sim.handlers;
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/RequestHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/RequestHandler.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/RequestHandler.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// The parent class of ChkRequestHandler and SskRequestHandler
package sim.handlers;
@@ -71,24 +73,17 @@
}
// EventTarget interface
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- switch (type) {
- case ACCEPTED_TIMEOUT:
+ if (code == ACCEPTED_TIMEOUT)
acceptedTimeout ((Peer) data);
- break;
-
- case SEARCH_TIMEOUT:
+ else if (code == SEARCH_TIMEOUT)
searchTimeout ((Peer) data);
- break;
-
- case TRANSFER_TIMEOUT:
+ else if (code == TRANSFER_TIMEOUT)
transferTimeout ((Peer) data);
- break;
- }
}
- protected final static int ACCEPTED_TIMEOUT = 1;
- protected final static int SEARCH_TIMEOUT = 2;
- protected final static int TRANSFER_TIMEOUT = 3;
+ protected final static int ACCEPTED_TIMEOUT = Event.code();
+ protected final static int SEARCH_TIMEOUT = Event.code();
+ protected final static int TRANSFER_TIMEOUT = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/SskInsertHandler.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// The state of an SSK insert as stored at each node along the path
package sim.handlers;
@@ -161,24 +163,17 @@
}
// EventTarget interface
- public void handleEvent (int type, Object data)
+ public void handleEvent (int code, Object data)
{
- switch (type) {
- case KEY_TIMEOUT:
+ if (code == KEY_TIMEOUT)
keyTimeout();
- break;
-
- case ACCEPTED_TIMEOUT:
+ else if (code == ACCEPTED_TIMEOUT)
acceptedTimeout ((Peer) data);
- break;
-
- case SEARCH_TIMEOUT:
+ else if (code == SEARCH_TIMEOUT)
searchTimeout ((Peer) data);
- break;
- }
}
- private final static int KEY_TIMEOUT = 1;
- private final static int ACCEPTED_TIMEOUT = 2;
- private final static int SEARCH_TIMEOUT = 3;
+ private final static int KEY_TIMEOUT = Event.code();
+ private final static int ACCEPTED_TIMEOUT = Event.code();
+ private final static int SEARCH_TIMEOUT = Event.code();
}
Modified: trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/handlers/SskRequestHandler.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// The state of an SSK request as stored at each node along the path
package sim.handlers;
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/Accepted.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/Accepted.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/Accepted.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class Accepted extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/Block.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/Block.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/Block.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// A single block of a multi-block transfer (currently 32 blocks per transfer)
package sim.messages;
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/ChkDataFound.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/ChkDataFound.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/ChkDataFound.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class ChkDataFound extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/ChkInsert.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/ChkInsert.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/ChkInsert.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
import sim.clients.Client;
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/ChkRequest.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/ChkRequest.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/ChkRequest.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class ChkRequest extends Search
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/DataInsert.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/DataInsert.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/DataInsert.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class DataInsert extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/DataNotFound.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/DataNotFound.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/DataNotFound.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class DataNotFound extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/InsertReply.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/InsertReply.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/InsertReply.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class InsertReply extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/Message.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/Message.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/Message.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
// A high-level message (as opposed to a low-level packet)
package sim.messages;
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedLoop.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedLoop.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedLoop.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class RejectedLoop extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedOverload.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedOverload.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/RejectedOverload.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class RejectedOverload extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/RouteNotFound.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/RouteNotFound.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/RouteNotFound.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class RouteNotFound extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/Search.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/Search.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/Search.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
import sim.clients.Client;
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/SskAccepted.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/SskAccepted.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/SskAccepted.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class SskAccepted extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/SskDataFound.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/SskDataFound.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/SskDataFound.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class SskDataFound extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/SskInsert.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/SskInsert.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/SskInsert.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
import sim.clients.Client;
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/SskPubKey.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/SskPubKey.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/SskPubKey.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class SskPubKey extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/SskRequest.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/SskRequest.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/SskRequest.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class SskRequest extends Search
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/Token.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/Token.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/Token.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class Token extends Message
Modified: trunk/apps/load-balancing-sims/phase7/sim/messages/TransfersCompleted.java
===================================================================
--- trunk/apps/load-balancing-sims/phase7/sim/messages/TransfersCompleted.java 2008-03-01 17:53:41 UTC (rev 18290)
+++ trunk/apps/load-balancing-sims/phase7/sim/messages/TransfersCompleted.java 2008-03-01 18:41:40 UTC (rev 18291)
@@ -1,3 +1,5 @@
+// This software has been placed in the public domain by its author
+
package sim.messages;
public class TransfersCompleted extends Message
More information about the cvs
mailing list