final order

wenzhel101 · Feb 11, 2014 · f915d38 · f915d38
1 parent e28b445
commit f915d38
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 12 deletions.
diff --git a/.classpath b/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="/Users/wenzheli/Workspaces/lab2/snakeyaml-1.13.jar"/>
+	<classpathentry kind="lib" path="E:/18842/snakeyaml-1.13.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bin/lab2/Clock.class b/bin/lab2/Clock.class
diff --git a/bin/lab2/GroupsRpg.class b/bin/lab2/GroupsRpg.class
diff --git a/bin/lab2/HostInfo.class b/bin/lab2/HostInfo.class
diff --git a/bin/lab2/Hosts.class b/bin/lab2/Hosts.class
diff --git a/bin/lab2/Logger$LogClientThread.class b/bin/lab2/Logger$LogClientThread.class
diff --git a/bin/lab2/Logger.class b/bin/lab2/Logger.class
diff --git a/bin/lab2/MessagePasser$ClientThread.class b/bin/lab2/MessagePasser$ClientThread.class
diff --git a/bin/lab2/MessagePasser.class b/bin/lab2/MessagePasser.class
diff --git a/bin/lab2/MulticastMessagePasser.class b/bin/lab2/MulticastMessagePasser.class
diff --git a/bin/lab2/Rules.class b/bin/lab2/Rules.class
diff --git a/bin/lab2/VectorClock.class b/bin/lab2/VectorClock.class
diff --git a/src/lab2/MessagePasser.java b/src/lab2/MessagePasser.java
@@ -303,8 +303,8 @@ public void run() {
 							MulticastMessage receiveMessage= mmp.receive((MulticastMessage)(incomingMessage));
 							if(receiveMessage != null){
 								// update group clock
-								/*groupsRpg.getClockGroup().get(receiveMessage.getGroupName()
-										).adjustClock(receiveMessage.getClockForGroup());*/
+								groupsRpg.getClockGroup().get(receiveMessage.getGroupName()
+										).adjustClock(receiveMessage.getClockForGroup());
 
 								inputQueue.add(receiveMessage);	
 
@@ -337,8 +337,8 @@ public void run() {
 									MulticastMessage dup = new MulticastMessage((MulticastMessage)receiveMessage);
 									dup.setDuplicate(true);
 									// update group clock
-									/*groupsRpg.getClockGroup().get(receiveMessage.getGroupName()
-											).adjustClock(receiveMessage.getClockForGroup());*/
+									groupsRpg.getClockGroup().get(receiveMessage.getGroupName()
+											).adjustClock(receiveMessage.getClockForGroup());
 									inputQueue.add(receiveMessage);
 									inputQueue.add(dup);
 								}
@@ -409,8 +409,8 @@ private void inputReceiveBuffer(){
 				MulticastMessage receiveMessage = mmp.receive((MulticastMessage)(delayMsg));
 				if(receiveMessage != null) {
 					// update group clock
-					/*groupsRpg.getClockGroup().get(receiveMessage.getGroupName()
-							).adjustClock(receiveMessage.getClockForGroup());*/
+					groupsRpg.getClockGroup().get(receiveMessage.getGroupName()
+							).adjustClock(receiveMessage.getClockForGroup());
 					inputQueue.add(receiveMessage);
 				}
 			}
@@ -432,19 +432,19 @@ private void showCommandPrompt() {
 			while ((inputCommand = in.readLine()) != null) {
 				String[] tokens = inputCommand.split(" ");
 				if (tokens.length > 0) {
-					if ("s".equals(tokens[0]) && tokens.length == 3) {
+					if ("s".equals(tokens[0]) && tokens.length == 4) {
 						/**
 						 * send multicast message
 						 */
 						if(tokens[1].startsWith("Group")){
-							Message message = new Message(tokens[1], tokens[2], null);
+							Message message = new Message(tokens[1], tokens[2], tokens[3]);
 							message.setSource(localName);
 							this.hostTimeStamp.addClock();
 							this.mmp.send(tokens[1], message);
 						}
 						else{
 							// Send: Create a new message and send
-							Message message = new Message(tokens[1], tokens[2], null);
+							Message message = new Message(tokens[1], tokens[2], tokens[3]);
 							message.setSource(localName);
 							message.setSeqNum(nextSeqNum++);
 							// Increment Local TimeStamp
@@ -471,8 +471,8 @@ else if(message instanceof MulticastMessage){
 								MulticastMessage mcMessage = (MulticastMessage) message;
 								System.out.println(mcMessage.toString());
 								this.hostTimeStamp.adjustClock(mcMessage.getTimeStamp());
-								groupsRpg.getClockGroup().get(mcMessage.getGroupName()
-										).adjustClock(mcMessage.getClockForGroup());
+								//groupsRpg.getClockGroup().get(mcMessage.getGroupName()
+								//		).adjustClock(mcMessage.getClockForGroup());
 							}
 						}