Update Time Server

gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/agent/MeasureAgent.java

@@ -60,7 +60,7 @@ public class MeasureAgent {
 
 			// Registry port for rmi communication
 			LocateRegistry.createRegistry(port);
-//			System.setProperty("java.rmi.server.hostname",address);
+			System.setProperty("java.rmi.server.hostname",address);
 
 			// Creating and starting RMI connector
 			JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + address + ":" + port + "/server");
@@ -122,11 +122,11 @@ public class MeasureAgent {
 	public synchronized void fire(long timestamp) {
 		
 		
-		// timestamp = clockSync.getAdjustedTime();
+		long adjustedTimestamp = clockSync.getAdjustedTime();
 		//long localServerTimestamp = getTimestamp();
 		try{
 			
-			 measure.setTimestamp(timestamp + getDeltaTime());
+			 measure.setTimestamp(adjustedTimestamp + getDeltaTime());
 			 
 		} catch (IOException e) {
 			// TODO Auto-generated catch block

gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/clocksync/LocalTimeServer.java

@@ -21,10 +21,8 @@ public class LocalTimeServer extends Thread{
 			clockSync = new ClockSync();
 			clockSync.startSync();
 			serverSocket = new DatagramSocket(MonitorConstant.TIME_SERVER_PORT);
-			if(serverSocket.isConnected()){
-				
-				System.out.println("Time server start at port : "+MonitorConstant.TIME_SERVER_PORT);
-			}
+			System.out.println("Time server start at port : "+MonitorConstant.TIME_SERVER_PORT);
+			
 			
 			
 		} catch (IOException e) {
@@ -64,4 +62,12 @@ public class LocalTimeServer extends Thread{
 	}
 	
 	
+	public static void main(String args[]) throws Exception
+	{
+		
+		LocalTimeServer timeServer = new LocalTimeServer();
+		timeServer.start();
+		
+	}
+	
 }

gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/monitor/MonitorMain.java

@@ -33,10 +33,6 @@ public class MonitorMain {
 //		MeasureListener listener_5 = new MeasureListener("timestamp_6", "localhost", "9005");
 		
 		
-//		Start Local time server
-		LocalTimeServer timeServer = new LocalTimeServer();
-		timeServer.start();
-		
 		MeasureListener listener_0 = new MeasureListener("timestamp_1", "128.93.65.234", "9000");
 		MeasureListener listener_1 = new MeasureListener("timestamp_2", "128.93.65.233", "9001");
 		MeasureListener listener_2 = new MeasureListener("timestamp_3", "128.93.65.233", "9002");
@@ -172,7 +168,7 @@ public class MonitorMain {
 		System.out.println("\n=========================================================== ");
 		System.out.println("Start time: " +start );
 		System.out.println("Complete time: " +complete );
-		System.out.println("Messages sent: " + experimentMsgSent );
+		System.out.println("Messages sent: " + experimentListener.experimentMsgCounter );
 		System.out.println("Messages waited in the queue: " + experimentMsgNotTransmited );
 		System.out.println("Messages receive: " + experimentMsgReceive);
 		System.out.println("Messages lost: " + (experimentListener.experimentMsgCounter - experimentMsgReceive) );