[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory ExperimentDataCollector.java, 1.12, 1.13

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29997/edu/wustl/mobilab/directory

Modified Files:
	ExperimentDataCollector.java 
Log Message:


Index: ExperimentDataCollector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory/ExperimentDataCollector.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ExperimentDataCollector.java	10 Apr 2006 23:27:07 -0000	1.12
--- ExperimentDataCollector.java	11 Apr 2006 02:53:54 -0000	1.13
***************
*** 60,64 ****
  			Mote mote = new Mote(ports[i], moteIF);			
  			moteIF.registerListener(new AgillaExpLatencyMsg(), mote);
! 			moteIF.registerListener(new AgillaExpResultsMsg(), mote);
  			moteIF.registerListener(new AgillaTraceMsg(), traceRcvr);
  			moteIF.registerListener(new AgillaTraceGetAgentsMsg(), traceRcvr);
--- 60,64 ----
  			Mote mote = new Mote(ports[i], moteIF);			
  			moteIF.registerListener(new AgillaExpLatencyMsg(), mote);
! //			moteIF.registerListener(new AgillaExpResultsMsg(), mote);
  			moteIF.registerListener(new AgillaTraceMsg(), traceRcvr);
  			moteIF.registerListener(new AgillaTraceGetAgentsMsg(), traceRcvr);
***************
*** 81,85 ****
  	private void doFinish() {
  		// for each mote, get the number of queries and updates
! 		int totalNumQueries = 0, totalNumUpdates = 0;
  		long totalLatencies = 0, totalLatenciesCount = 0;
  		
--- 81,85 ----
  	private void doFinish() {
  		// for each mote, get the number of queries and updates
! 		//int totalNumQueries = 0, totalNumUpdates = 0;
  		long totalLatencies = 0, totalLatenciesCount = 0;
  		
***************
*** 89,101 ****
  			c.moteIF.deregisterListener(new AgillaTraceMsg(), traceRcvr);
  		}
! 		
! 		
  		for (int i = 0; i < motes.size(); i++) {
  			Mote c = motes.get(i);
  			if (c.tcpPort != GATEWAY_PORT) {
! 				c.fetchResults();
! 				System.out.println(c);
! 				totalNumQueries += c.numQueries;
! 				totalNumUpdates += c.numUpdates;
  				totalLatencies += c.totalLatency();
  				totalLatenciesCount += c.numLatencies();
--- 89,101 ----
  			c.moteIF.deregisterListener(new AgillaTraceMsg(), traceRcvr);
  		}
! 
  		for (int i = 0; i < motes.size(); i++) {
  			Mote c = motes.get(i);
  			if (c.tcpPort != GATEWAY_PORT) {
! 				//c.fetchResults();
! 				if (c.hasLatencies())
! 					System.out.println(c);
! 				//totalNumQueries += c.numQueries;
! 				//totalNumUpdates += c.numUpdates;
  				totalLatencies += c.totalLatency();
  				totalLatenciesCount += c.numLatencies();
***************
*** 104,110 ****
  		
  		System.out.println("-------- Overall Results --------");
! 		System.out.println("Total Number of Queries: " + totalNumQueries);
! 		System.out.println("Total Number of Updates: " + totalNumUpdates);
! 		System.out.println("Average Query Latency = " + (totalLatenciesCount == 0 ? "NaN" : totalLatencies/totalLatenciesCount));		
  		System.exit(0);
  	}
--- 104,110 ----
  		
  		System.out.println("-------- Overall Results --------");
! 		//System.out.println("Total Number of Queries: " + totalNumQueries);
! 		//System.out.println("Total Number of Updates: " + totalNumUpdates);
! 		System.out.println("Average Query Latency (ms): " + (totalLatenciesCount == 0 ? "NaN" : totalLatencies/totalLatenciesCount));		
  		System.exit(0);
  	}
***************
*** 225,235 ****
  	private class Mote implements MessageListener  {
  		int tcpPort;
! 		int numQueries;
! 		int numUpdates;
  		MoteIF moteIF;
  		Vector<AgillaExpLatencyMsgJ> latencies = new Vector<AgillaExpLatencyMsgJ>();
! 		Object lock = new Object();
! 		boolean gotResults = false;
! 		FetchResultsTimer timer = null;
  		
  		public Mote(int tcpPort, MoteIF moteIF) {
--- 225,235 ----
  	private class Mote implements MessageListener  {
  		int tcpPort;
! 		//int numQueries;
! 		//int numUpdates;
  		MoteIF moteIF;
  		Vector<AgillaExpLatencyMsgJ> latencies = new Vector<AgillaExpLatencyMsgJ>();
! 		//Object lock = new Object();
! 		//boolean gotResults = false;
! 		//FetchResultsTimer timer = null;
  		
  		public Mote(int tcpPort, MoteIF moteIF) {
***************
*** 238,241 ****
--- 238,245 ----
  		}
  		
+ 		public boolean hasLatencies() {
+ 			return latencies.size() != 0;
+ 		}
+ 		
  		public void messageReceived(int to, Message m) {
  			if (m instanceof AgillaExpLatencyMsg) {				
***************
*** 245,249 ****
  				log("Port " + tcpPort + ": Latency " + ajm.get_latency() + " " + msgj);
  				latencies.add(msgj);
! 			} else if (m instanceof AgillaExpResultsMsg) {
  				synchronized(lock) {
  					numQueries = ((AgillaExpResultsMsg)m).get_numQueries();
--- 249,254 ----
  				log("Port " + tcpPort + ": Latency " + ajm.get_latency() + " " + msgj);
  				latencies.add(msgj);
! 			} 
! 			/*else if (m instanceof AgillaExpResultsMsg) {
  				synchronized(lock) {
  					numQueries = ((AgillaExpResultsMsg)m).get_numQueries();
***************
*** 257,264 ****
  					lock.notify();
  				}
! 			}			
  		}
  		
! 		public void fetchResults() {
  			gotResults = false;
  			int numTries = 0;
--- 262,269 ----
  					lock.notify();
  				}
! 			}*/		
  		}
  		
! 		/*public void fetchResults() {
  			gotResults = false;
  			int numTries = 0;
***************
*** 313,317 ****
  			    }
  			}
! 		}
  		
  		public int numLatencies() {
--- 318,322 ----
  			    }
  			}
! 		}*/
  		
  		public int numLatencies() {
***************
*** 342,346 ****
  		
  		public String toString() {
! 			return "TCP Port " + tcpPort + ", numQueries = " + numQueries + ", numUpdates = " + numUpdates + "\n" + printLatencies();
  		}
  	}
--- 347,351 ----
  		
  		public String toString() {
! 			return "Latencies from mote attached to TCP Port " + tcpPort + /*", numQueries = " + numQueries + ", numUpdates = " + numUpdates +*/ "\n" + printLatencies();
  		}
  	}