Merge pull request #17 from vicweeks/milestone4

Milestone4

Author: vicweeks

Weeks_Victor_ASG1.tar

@@ -32,10 +32,8 @@ public void run() {
 		byte[] data = new byte[dataLength];
 		din.readFully(data, 0, dataLength);
 		Event receivedEvent = eventFactory.constructEvent(data);
-
-		synchronized(node) {
-		    node.onEvent(self, receivedEvent);
-		}
+      
+		node.onEvent(self, receivedEvent);
 
 	    } catch (SocketException se) {
 		System.out.println(se.getMessage());

cs455/overlay/transport/TCPReceiver.java

@@ -124,11 +124,12 @@ private void onReceivedTaskInitiateRequest(TCPConnection connection, Event event
 	    reportTaskFinished();
 	} catch (IOException ioe) {
 	    System.out.println(ioe.getMessage());
-	}	
+	}
+	
     }
 
     // Message Type 9
-    private void onReceivedData(TCPConnection connection, Event event) {
+    private synchronized void onReceivedData(TCPConnection connection, Event event) {
 	OverlayNodeSendsData dataPacket = (OverlayNodeSendsData) event;
 	int destID = dataPacket.getDestID();
 	try {
@@ -220,7 +221,6 @@ private void sendDataPacket() throws IOException {
 	linkConnection.sendMessage(dataPacketMessage);
 
 	synchronized(this) {
-	    //linkConnection.sendMessage(dataPacketMessage);
 	    this.sendTracker++;
 	    this.sendSummation += payload;
 	}	
@@ -285,7 +285,6 @@ private void relayDataPacket(OverlayNodeSendsData dataPacket) throws IOException
 	linkConnection.sendMessage(relayDataPacket);
 
 	synchronized(this) {
-	    //linkConnection.sendMessage(relayDataPacket);
 	    this.relayTracker++;
 	}	
     }

cs455/overlay/wireformats/MessagingProtocol.java

@@ -33,6 +33,11 @@ public TCPConnectionsCache getConnectionCache() {
 	return connectionCache;
     }
 
+    // command reset-task
+    public void resetTask() {
+	requestTrafficSummary();
+    }
+
     // command list-messaging-nodes
     public void listMessagingNodes() {
 	for (RoutingEntry entry : sortedEntries.values()) {