[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery MgmtQueryCommander.java, 1.18, 1.19

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29603/java/net/tinyos/mgmtquery

Modified Files:
	MgmtQueryCommander.java 
Log Message:
* Added an estimator to MultiHopRSSI that checks for asymmetric links
and downed nodes by keeping track of the percentage of acknowledged
packets. This estimate is then added into the link cost. -DNO_ACK_EST
to disable it, because it's still sort of new, though tested to be
more responsive.

* Added timestamps to the MgmtQuery results, and cleaned up the log
output of EventLogger.

* You can now disable sleep-on-boot by defining HELLO_NO_SLEEP. Useful
in the testbed.



Index: MgmtQueryCommander.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryCommander.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MgmtQueryCommander.java	24 Aug 2004 23:34:50 -0000	1.18
--- MgmtQueryCommander.java	1 Sep 2004 01:32:29 -0000	1.19
***************
*** 257,261 ****
  
    void printHeader() {
!     System.out.print("Addr\tSeqno\tTTL\t");
      for(int i = 0; i < queryNames.size(); i++) {
        String queryName = (String)queryNames.get(i);
--- 257,261 ----
  
    void printHeader() {
!     System.out.print("Time\t\tAddr\tSeqno\tTTL\t");
      for(int i = 0; i < queryNames.size(); i++) {
        String queryName = (String)queryNames.get(i);
***************
*** 275,279 ****
    private void printQueryResult(MgmtQueryResult qr) {
  
!     System.out.print(qr.getSourceAddr() + "\t" + qr.getSampleNumber() + "\t" + qr.getTTL() + "\t");
      
      int numCols = qr.getColumnCount();
--- 275,279 ----
    private void printQueryResult(MgmtQueryResult qr) {
  
!     System.out.print(System.currentTimeMillis() + "\t" + qr.getSourceAddr() + "\t" + qr.getSampleNumber() + "\t" + qr.getTTL() + "\t");
      
      int numCols = qr.getColumnCount();
***************
*** 282,285 ****
--- 282,289 ----
        
        SchemaEntry se = (SchemaEntry) schema.get((String)queryNames.get(i));
+       
+       if (se == null) {
+ 	continue;
+       }
  
        if (se.type.equals("MA_TYPE_UINT")) {
***************
*** 306,310 ****
        seqno = qr.getSampleNumber();
        
!       System.out.println("Total nodes: " + nodes.size());
        int active = 0;
        int missCount = 0;
--- 310,314 ----
        seqno = qr.getSampleNumber();
        
!       System.out.println(System.currentTimeMillis() + " " + "Total nodes: " + nodes.size());
        int active = 0;
        int missCount = 0;
***************
*** 322,326 ****
  	}
        }
!       System.out.println(active + " nodes heard, " + missCount + " nodes inactive: {" + missed + "}"); 
        printHeader();
      }
--- 326,330 ----
  	}
        }
!       System.out.println(System.currentTimeMillis() + " " + active + " nodes heard, " + missCount + " nodes inactive: {" + missed + "}"); 
        printHeader();
      }