diff options
Diffstat (limited to 'sources/protocols/implementations')
9 files changed, 23 insertions, 23 deletions
diff --git a/sources/protocols/implementations/VSBasicMulticastProtocol.java b/sources/protocols/implementations/VSBasicMulticastProtocol.java index 35bb319..76b13b5 100644 --- a/sources/protocols/implementations/VSBasicMulticastProtocol.java +++ b/sources/protocols/implementations/VSBasicMulticastProtocol.java @@ -94,7 +94,7 @@ public class VSBasicMulticastProtocol extends VSAbstractProtocol { */ public void onServerRecv(VSMessage recvMessage) { if (recvMessage.getBoolean("isMulticast")) - logg("Multicast erhalten"); + log("Multicast erhalten"); } /* (non-Javadoc) diff --git a/sources/protocols/implementations/VSBerkelyTimeProtocol.java b/sources/protocols/implementations/VSBerkelyTimeProtocol.java index 382a470..1b8b6fc 100644 --- a/sources/protocols/implementations/VSBerkelyTimeProtocol.java +++ b/sources/protocols/implementations/VSBerkelyTimeProtocol.java @@ -208,7 +208,7 @@ public class VSBerkelyTimeProtocol extends VSAbstractProtocol { long timeDiff = recvMessage.getLong("timeDiff"); long recvTime = process.getTime(); long newTime = process.getTime() + timeDiff; - logg("Neue Zeit: " + newTime); + log("Neue Zeit: " + newTime); process.setTime(newTime); } diff --git a/sources/protocols/implementations/VSDummyProtocol.java b/sources/protocols/implementations/VSDummyProtocol.java index 86b461d..b06e256 100644 --- a/sources/protocols/implementations/VSDummyProtocol.java +++ b/sources/protocols/implementations/VSDummyProtocol.java @@ -54,14 +54,14 @@ public class VSDummyProtocol extends VSAbstractProtocol { * @see protocols.VSAbstractProtocol#onClientReset() */ public void onClientReset() { - logg("onClientReset()"); + log("onClientReset()"); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onClientStart() */ public void onClientStart() { - logg("onClientStart()"); + log("onClientStart()"); VSMessage message = new VSMessage(); message.setString("Greeting", "Hello World!"); @@ -75,7 +75,7 @@ public class VSDummyProtocol extends VSAbstractProtocol { * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ public void onClientRecv(VSMessage recvMessage) { - logg("onClientRecv("+recvMessage+")"); + log("onClientRecv("+recvMessage+")"); String s = recvMessage.getString("Greeting"); int n = recvMessage.getInteger("A number"); @@ -99,14 +99,14 @@ public class VSDummyProtocol extends VSAbstractProtocol { * @see protocols.VSAbstractProtocol#onServerReset() */ public void onServerReset() { - logg("onClientReset()"); + log("onClientReset()"); } /* (non-Javadoc) * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ public void onServerRecv(VSMessage recvMessage) { - logg("onServerRecv("+recvMessage+")"); + log("onServerRecv("+recvMessage+")"); } /* (non-Javadoc) diff --git a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java index d8b792f..0e73ac3 100644 --- a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java +++ b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java @@ -92,7 +92,7 @@ public class VSExternalTimeSyncProtocol extends VSAbstractProtocol { long serverTime = recvMessage.getLong("time"); long newTime = serverTime + (long) (roundTripTime / 2); - logg("Server Zeit: " + serverTime + "; RTT: " + roundTripTime + + log("Server Zeit: " + serverTime + "; RTT: " + roundTripTime + "; Alte Zeit: " + recvTime + "; Neue Zeit: " + newTime + "; Offset: " + (newTime - recvTime)); process.setTime(newTime); diff --git a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java index 21eda4a..6f82203 100644 --- a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java +++ b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java @@ -92,7 +92,7 @@ public class VSInternalTimeSyncProtocol extends VSAbstractProtocol { long serverTime = recvMessage.getLong("time"); long newTime = serverTime + (long) ((tMax + tMin) / 2 ); - logg("Server Zeit: " + serverTime + "; (t_min,t_max): (" + tMin + + log("Server Zeit: " + serverTime + "; (t_min,t_max): (" + tMin + "," + tMax + "); Alte Zeit: " + process.getTime() + "; Neue Zeit: " + newTime + "; Offset: " + (process.getTime() - newTime)); diff --git a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java index 51ac9c7..aa1f6ed 100644 --- a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java +++ b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java @@ -107,10 +107,10 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol { else return; - logg("ACK von Prozess " + pid + " erhalten!"); + log("ACK von Prozess " + pid + " erhalten!"); if (pids.size() == 0) { - logg("ACKs von allen beteiligten Prozessen erhalten! " + + log("ACKs von allen beteiligten Prozessen erhalten! " + "Festgeschrieben!"); /* Remove the active schedule which has been created in the @@ -156,7 +156,7 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol { message.setInteger("pid", process.getProcessID()); sendMessage(message); ackSent = true; - logg("Festgeschrieben"); + log("Festgeschrieben"); } /* (non-Javadoc) diff --git a/sources/protocols/implementations/VSPingPongProtocol.java b/sources/protocols/implementations/VSPingPongProtocol.java index 288e836..f82d991 100644 --- a/sources/protocols/implementations/VSPingPongProtocol.java +++ b/sources/protocols/implementations/VSPingPongProtocol.java @@ -79,7 +79,7 @@ public class VSPingPongProtocol extends VSAbstractProtocol { if (!recvMessage.getBoolean("fromServer")) return; - logg("message: " + recvMessage.getInteger("counter")); + log("message: " + recvMessage.getInteger("counter")); VSMessage message = new VSMessage(); message.setBoolean("fromClient", true); @@ -113,7 +113,7 @@ public class VSPingPongProtocol extends VSAbstractProtocol { if (!recvMessage.getBoolean("fromClient")) return; - logg("message: " + recvMessage.getInteger("counter")); + log("message: " + recvMessage.getInteger("counter")); VSMessage message = new VSMessage(); message.setBoolean("fromServer", true); diff --git a/sources/protocols/implementations/VSReliableMulticastProtocol.java b/sources/protocols/implementations/VSReliableMulticastProtocol.java index 06e5c7b..9cfb04c 100644 --- a/sources/protocols/implementations/VSReliableMulticastProtocol.java +++ b/sources/protocols/implementations/VSReliableMulticastProtocol.java @@ -104,10 +104,10 @@ public class VSReliableMulticastProtocol extends VSAbstractProtocol { else return; - logg("ACK von Prozess " + pid + " erhalten!"); + log("ACK von Prozess " + pid + " erhalten!"); if (pids.size() == 0) { - logg("ACKs von allen beteiligten Prozessen " + + log("ACKs von allen beteiligten Prozessen " + "erhalten!"); /* Remove the active schedule which has been created in the @@ -151,10 +151,10 @@ public class VSReliableMulticastProtocol extends VSAbstractProtocol { sendMessage(message); if (ackSent) { - logg("ACK erneut versendet"); + log("ACK erneut versendet"); } else { - logg("ACK versendet"); + log("ACK versendet"); ackSent = true; } } diff --git a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java index d4f1190..b783b53 100644 --- a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java +++ b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java @@ -128,14 +128,14 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol { return; boolean vote = recvMessage.getBoolean("vote"); - logg("Abstimmung von Prozess " + pid + + log("Abstimmung von Prozess " + pid + " erhalten! Ergebnis: " + vote); if (!vote) voteResult = false; if (votePids.size() == 0) { - logg("Abstimmungen von allen beteiligten Prozessen " + + log("Abstimmungen von allen beteiligten Prozessen " + "erhalten! Globales Ergebnis: " + voteResult); /* Remove the active schedule which has been created in the @@ -156,7 +156,7 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol { /* Remove the active schedule which has been created in the onServerStart method */ removeSchedules(); - logg("Alle Teilnehmer haben die Abstimmung erhalten"); + log("Alle Teilnehmer haben die Abstimmung erhalten"); } } } @@ -202,11 +202,11 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol { message.setInteger("pid", process.getProcessID()); sendMessage(message); - logg("Abstimmung " + myVote + " versendet"); + log("Abstimmung " + myVote + " versendet"); } else if (recvMessage.getBoolean("isVoteResult")) { boolean voteResult = recvMessage.getBoolean("voteResult"); - logg("Globales Abstimmungsergebnis erhalten. Ergebnis: " + + log("Globales Abstimmungsergebnis erhalten. Ergebnis: " + voteResult); VSMessage message = new VSMessage(); |