diff options
| author | Paul Buetow <paul@buetow.org> | 2008-05-27 17:23:45 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-05-27 17:23:45 +0000 |
| commit | 97a3a4f07cdc8437f73f4270b237e85c7739a6be (patch) | |
| tree | 32154e63775f1fa145d176301840e3150b8eb001 /sources/protocols/implementations | |
| parent | 39e9eb74c011ee5351ac1796e5df529a70aa8945 (diff) | |
client and server variables are now separate in the editor.
Diffstat (limited to 'sources/protocols/implementations')
8 files changed, 138 insertions, 99 deletions
diff --git a/sources/protocols/implementations/BerkelyTimeProtocol.java b/sources/protocols/implementations/BerkelyTimeProtocol.java index 890221a..d680f41 100644 --- a/sources/protocols/implementations/BerkelyTimeProtocol.java +++ b/sources/protocols/implementations/BerkelyTimeProtocol.java @@ -17,7 +17,12 @@ import java.util.Vector; public class BerkelyTimeProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; - /* Berkely Server variables */ + /** + * Instantiates a new berkely time protocol. + */ + public BerkelyTimeProtocol() { + setClassname(getClass().toString()); + } /** Integer: Process ID, Long: Local time of the process */ private HashMap<Integer,Long> processTimes = new HashMap<Integer,Long>(); @@ -34,12 +39,11 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { /** Time the request/response has started */ private long requestTime; - /** - * Instantiates a new berkely time protocol. - */ - public BerkelyTimeProtocol() { - setClassname(getClass().toString()); + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onClientInit() + */ + public void onClientInit() { /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. */ Vector<Integer> vec = new Vector<Integer>(); vec.add(2); @@ -48,15 +52,9 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() - */ - protected void onInit() { - } - - /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { processTimes.clear(); recvTimes.clear(); realTimesRTT.clear(); @@ -67,7 +65,7 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { peers.addAll(getVector("pids")); requestTime = process.getTime(); VSMessage message = new VSMessage(); @@ -78,7 +76,7 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { /* Ignore all protocol messages which are not a response message, e.g. itself */ if (!recvMessage.getBoolean("isResponse")) return; @@ -110,7 +108,7 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { } /** @@ -151,15 +149,21 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { } /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { + } + + /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { if (recvMessage.getBoolean("isRequest")) { VSMessage message = new VSMessage(); message.setInteger("processID", process.getProcessID()); @@ -184,7 +188,7 @@ public class BerkelyTimeProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) diff --git a/sources/protocols/implementations/BroadcastSturmProtocol.java b/sources/protocols/implementations/BroadcastSturmProtocol.java index cfd258c..1121e98 100644 --- a/sources/protocols/implementations/BroadcastSturmProtocol.java +++ b/sources/protocols/implementations/BroadcastSturmProtocol.java @@ -31,21 +31,21 @@ public class BroadcastSturmProtocol extends VSAbstractProtocol { } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() + * @see events.VSAbstractProtocol#onClientInit() */ - protected void onInit() { + public void onClientInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { VSMessage message = new VSMessage(); message.setInteger("Broadcast", broadcastCount++); sentMessages.add(message); @@ -55,32 +55,38 @@ public class BroadcastSturmProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { + } + + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { sentMessages.clear(); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { if (!sentMessages.contains(recvMessage)) { VSMessage message = new VSMessage(); message.setInteger("Broadcast", recvMessage.getInteger("Broadcast")); diff --git a/sources/protocols/implementations/DummyProtocol.java b/sources/protocols/implementations/DummyProtocol.java index 684de87..91e46c8 100644 --- a/sources/protocols/implementations/DummyProtocol.java +++ b/sources/protocols/implementations/DummyProtocol.java @@ -7,7 +7,6 @@ package protocols.implementations; import protocols.VSAbstractProtocol; import core.VSMessage; -// TODO: Auto-generated Javadoc /** * The Class DummyProtocol. */ @@ -22,22 +21,22 @@ public class DummyProtocol extends VSAbstractProtocol { } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() + * @see events.VSAbstractProtocol#onClientInit() */ - protected void onInit() { + public void onClientInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { logg("onClientReset()"); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { logg("onClientStart()"); VSMessage message = new VSMessage(); @@ -51,7 +50,7 @@ public class DummyProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { logg("onClientRecv("+recvMessage+")"); String s = recvMessage.getString("Greeting"); @@ -63,27 +62,33 @@ public class DummyProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { + } + + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { logg("onClientReset()"); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { logg("onServerRecv("+recvMessage+")"); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) diff --git a/sources/protocols/implementations/ExternalTimeSyncProtocol.java b/sources/protocols/implementations/ExternalTimeSyncProtocol.java index 243418a..97a20ef 100644 --- a/sources/protocols/implementations/ExternalTimeSyncProtocol.java +++ b/sources/protocols/implementations/ExternalTimeSyncProtocol.java @@ -28,21 +28,21 @@ public class ExternalTimeSyncProtocol extends VSAbstractProtocol { } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() + * @see events.VSAbstractProtocol#onClientInit() */ - protected void onInit() { + public void onClientInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { requestTime = process.getTime(); waitingForResponse = true; @@ -55,7 +55,7 @@ public class ExternalTimeSyncProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("isServerResponse")) return; @@ -76,19 +76,25 @@ public class ExternalTimeSyncProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { + } + + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("isClientRequest")) return; @@ -102,7 +108,7 @@ public class ExternalTimeSyncProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) diff --git a/sources/protocols/implementations/InternalTimeSyncProtocol.java b/sources/protocols/implementations/InternalTimeSyncProtocol.java index e196cfb..c35e201 100644 --- a/sources/protocols/implementations/InternalTimeSyncProtocol.java +++ b/sources/protocols/implementations/InternalTimeSyncProtocol.java @@ -23,27 +23,27 @@ public class InternalTimeSyncProtocol extends VSAbstractProtocol { public InternalTimeSyncProtocol() { setClassname(getClass().toString()); - /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. t_min and t_max in milliseconds */ - initLong("t_min", 2000, "Max. Übetragungszeit", "ms"); - initLong("t_max", 500, "Min. Übertragungszeit", "ms"); } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() + * @see events.VSAbstractProtocol#onClientInit() */ - protected void onInit() { + public void onClientInit() { + /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. t_min and t_max in milliseconds */ + initLong("t_min", 2000, "Max. Übetragungszeit", "ms"); + initLong("t_max", 500, "Min. Übertragungszeit", "ms"); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { waitingForResponse = true; /* Multicast message to all processes */ @@ -55,7 +55,7 @@ public class InternalTimeSyncProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { /* Ignore all protocol messages which are not a response message, e.g. itself */ if (!recvMessage.getBoolean("isServerResponse")) return; @@ -80,19 +80,25 @@ public class InternalTimeSyncProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { + } + + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { /* Ignore all protocol messages which are not a request message, e.g. itself */ if (!recvMessage.getBoolean("isClientRequest")) return; @@ -107,7 +113,7 @@ public class InternalTimeSyncProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) diff --git a/sources/protocols/implementations/OnePhaseCommitProtocol.java b/sources/protocols/implementations/OnePhaseCommitProtocol.java index c22c47d..53c8ce6 100644 --- a/sources/protocols/implementations/OnePhaseCommitProtocol.java +++ b/sources/protocols/implementations/OnePhaseCommitProtocol.java @@ -27,7 +27,12 @@ public class OnePhaseCommitProtocol extends VSAbstractProtocol { */ public OnePhaseCommitProtocol() { setClassname(getClass().toString()); + } + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onClientInit() + */ + public void onClientInit() { /* Can be changed via GUI variables editor of each process */ Vector<Integer> vec = new Vector<Integer>(); vec.add(2); @@ -38,15 +43,9 @@ public class OnePhaseCommitProtocol extends VSAbstractProtocol { } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() - */ - protected void onInit() { - } - - /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { if (pids != null) { pids.clear(); pids.addAll(getVector("pids")); @@ -56,7 +55,7 @@ public class OnePhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { if (pids == null) { pids = new ArrayList<Integer>(); pids.addAll(getVector("pids")); @@ -75,7 +74,7 @@ public class OnePhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { if (pids.size() == 0) return; @@ -96,21 +95,27 @@ public class OnePhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { onClientStart(); } /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { + } + + /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { ackSent = false; } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { if (ackSent) return; @@ -125,7 +130,7 @@ public class OnePhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) diff --git a/sources/protocols/implementations/PingPongProtocol.java b/sources/protocols/implementations/PingPongProtocol.java index 4082dd3..13a7b32 100644 --- a/sources/protocols/implementations/PingPongProtocol.java +++ b/sources/protocols/implementations/PingPongProtocol.java @@ -28,22 +28,22 @@ public class PingPongProtocol extends VSAbstractProtocol { } /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() + * @see events.VSAbstractProtocol#onClientInit() */ - protected void onInit() { + public void onClientInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { clientCounter = 0; } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { VSMessage message = new VSMessage(); message.setBoolean("fromClient", true); message.setInteger("counter", ++clientCounter); @@ -53,7 +53,7 @@ public class PingPongProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("fromServer")) return; @@ -68,20 +68,26 @@ public class PingPongProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { + } + + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { serverCounter = 0; } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("fromClient")) return; @@ -96,7 +102,7 @@ public class PingPongProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } /* (non-Javadoc) diff --git a/sources/protocols/implementations/TwoPhaseCommitProtocol.java b/sources/protocols/implementations/TwoPhaseCommitProtocol.java index b7c38f8..cd1a5ce 100644 --- a/sources/protocols/implementations/TwoPhaseCommitProtocol.java +++ b/sources/protocols/implementations/TwoPhaseCommitProtocol.java @@ -30,30 +30,24 @@ public class TwoPhaseCommitProtocol extends VSAbstractProtocol { */ public TwoPhaseCommitProtocol() { setClassname(getClass().toString()); + } - /* Can be changed via GUI variables editor of each process */ + /* (non-Javadoc) + * @see events.VSAbstractProtocol#onClientInit() + */ + public void onClientInit() { Vector<Integer> vec = new Vector<Integer>(); vec.add(2); vec.add(3); - /* Server */ initVector("pids", vec, "PIDs beteilitger Prozesse"); initLong("timeout", 2500, "Zeit bis erneuerter Anfrage", "ms"); - - /* Client */ - initInteger("ackProb", 50, "Festschreibw'keit", 0, 100, "%"); - } - - /* (non-Javadoc) - * @see events.VSAbstractEvent#onInit() - */ - protected void onInit() { } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientReset() */ - protected void onClientReset() { + public void onClientReset() { if (votePids != null) { voteResult = true; votePids.clear(); @@ -66,7 +60,7 @@ public class TwoPhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ - protected void onClientStart() { + public void onClientStart() { if (votePids == null) { voteResult = true; votePids = new ArrayList<Integer>(); @@ -97,7 +91,7 @@ public class TwoPhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ - protected void onClientRecv(VSMessage recvMessage) { + public void onClientRecv(VSMessage recvMessage) { if (votePids.size() != 0 && recvMessage.getBoolean("isVote")) { Integer pid = recvMessage.getIntegerObj("pid"); if (votePids.contains(pid)) @@ -136,7 +130,7 @@ public class TwoPhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientSchedule() */ - protected void onClientSchedule() { + public void onClientSchedule() { onClientStart(); } @@ -145,16 +139,23 @@ public class TwoPhaseCommitProtocol extends VSAbstractProtocol { private boolean myVote; /* (non-Javadoc) + * @see events.VSAbstractProtocol#onServerInit() + */ + public void onServerInit() { + initInteger("ackProb", 50, "Festschreibw'keit", 0, 100, "%"); + } + + /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerReset() */ - protected void onServerReset() { + public void onServerReset() { voteSent = false; } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ - protected void onServerRecv(VSMessage recvMessage) { + public void onServerRecv(VSMessage recvMessage) { if (recvMessage.getBoolean("wantVote")) { if (!voteSent) { voteSent = true; @@ -183,6 +184,6 @@ public class TwoPhaseCommitProtocol extends VSAbstractProtocol { /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerSchedule() */ - protected void onServerSchedule() { + public void onServerSchedule() { } } |
