[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery MgmtQuery.java, 1.2, 1.2.4.1 MgmtQueryCommander.java, 1.19, 1.19.4.1 MgmtQueryHost.java, 1.10, 1.10.4.1 MgmtQueryResult.java, 1.8, 1.8.4.1

[Kristin Wright]

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

Modified Files:
      Tag: tos-1-1-8-candidate
	MgmtQuery.java MgmtQueryCommander.java MgmtQueryHost.java 
	MgmtQueryResult.java 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: MgmtQuery.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQuery.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** MgmtQuery.java	24 Aug 2004 23:34:50 -0000	1.2
--- MgmtQuery.java	11 Nov 2004 13:43:29 -0000	1.2.4.1
***************
*** 41,43 ****
--- 41,47 ----
      return ramQuery;
    }
+ 
+   public String toString() {
+     return "period=" + samplePeriod + " ramQuery=" + ramQuery + "\n" + keyList;
+   }
  }

Index: MgmtQueryCommander.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryCommander.java,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -C2 -d -r1.19 -r1.19.4.1
*** MgmtQueryCommander.java	1 Sep 2004 01:32:29 -0000	1.19
--- MgmtQueryCommander.java	11 Nov 2004 13:43:29 -0000	1.19.4.1
***************
*** 174,177 ****
--- 174,179 ----
      System.out.println();
  
+     System.out.println(query);
+ 
      if (command.equals("query_oneshot")) {
  

Index: MgmtQueryHost.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryHost.java,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** MgmtQueryHost.java	26 Aug 2004 02:04:56 -0000	1.10
--- MgmtQueryHost.java	11 Nov 2004 13:43:29 -0000	1.10.4.1
***************
*** 74,78 ****
      currentQueries[qid-1] = q;
  
!     DripMsg msg = new DripMsg();
      msg.set_metadata_id((short) transformQid(qid));
      msg.set_metadata_seqno((byte)0);
--- 74,80 ----
      currentQueries[qid-1] = q;
  
!     DripMsg msg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + 
! 			      MgmtQueryMsg.DEFAULT_MESSAGE_SIZE +
! 			      (q.numAttrs() * ATTR_KEY_SIZE));
      msg.set_metadata_id((short) transformQid(qid));
      msg.set_metadata_seqno((byte)0);
***************
*** 80,86 ****
  //    System.out.println(msg);
  
!     MgmtQueryMsg queryMsg = new MgmtQueryMsg(msg, msg.offset_data(0), 
! 					     MgmtQueryMsg.DEFAULT_MESSAGE_SIZE
! 					     + (q.numAttrs() * ATTR_KEY_SIZE));
      
      queryMsg.set_epochLength(q.samplePeriod());
--- 82,89 ----
  //    System.out.println(msg);
  
!     MgmtQueryMsg queryMsg = 
! 	new MgmtQueryMsg(msg, msg.offset_data(0), 
! 			 MgmtQueryMsg.DEFAULT_MESSAGE_SIZE +
! 			 (q.numAttrs() * ATTR_KEY_SIZE));
      
      queryMsg.set_epochLength(q.samplePeriod());
***************
*** 96,105 ****
      }
  
- //    System.out.println(queryMsg);
      send(msg);
    }
  
    public void cancelQuery(int qid) {
!     DripMsg msg = new DripMsg();
      msg.set_metadata_id((short)transformQid(qid));
      msg.set_metadata_seqno((byte)0);
--- 99,108 ----
      }
  
      send(msg);
    }
  
    public void cancelQuery(int qid) {
!     DripMsg msg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + 
! 			      MgmtQueryMsg.DEFAULT_MESSAGE_SIZE);
      msg.set_metadata_id((short)transformQid(qid));
      msg.set_metadata_seqno((byte)0);
***************
*** 117,121 ****
      currentQueries[qid-1] = q;
  
!     DripMsg msg = new DripMsg();
      msg.set_metadata_id((short)transformQid(qid));
      msg.set_metadata_seqno((byte)0);
--- 120,126 ----
      currentQueries[qid-1] = q;
  
!     DripMsg msg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + 
! 			      MgmtQueryMsg.DEFAULT_MESSAGE_SIZE + 
! 			      (q.numAttrs() * ATTR_KEY_SIZE));
      msg.set_metadata_id((short)transformQid(qid));
      msg.set_metadata_seqno((byte)0);
***************
*** 128,131 ****
--- 133,138 ----
      queryMsg.set_msgType((byte)2);
      queryMsg.set_numAttrs((byte)q.numAttrs());
+     if (q.isRAMQuery())
+       queryMsg.set_ramQuery((byte)1);
  
      int i = 0;
***************
*** 166,170 ****
  
      MgmtQueryResult mqr = new MgmtQueryResult(mhMsg.get_originaddr(),
! 					      query, mqrMsg);
      mqr.setTTL(mhMsg.get_ttl());
  
--- 173,177 ----
  
      MgmtQueryResult mqr = new MgmtQueryResult(mhMsg.get_originaddr(),
! 					      query, mqrMsg, qid);
      mqr.setTTL(mhMsg.get_ttl());
  

Index: MgmtQueryResult.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryResult.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** MgmtQueryResult.java	24 Aug 2004 23:34:50 -0000	1.8
--- MgmtQueryResult.java	11 Nov 2004 13:43:29 -0000	1.8.4.1
***************
*** 10,16 ****
    private int sampleNumber;
    private int ttl;
  
    public MgmtQueryResult(int sourceAddr,
! 			 MgmtQuery q, MgmtQueryResponseMsg m) {
  
      int offset = 0;
--- 10,18 ----
    private int sampleNumber;
    private int ttl;
+   private int queryID;
  
    public MgmtQueryResult(int sourceAddr,
! 			 MgmtQuery q, MgmtQueryResponseMsg m,
! 			 int queryID) {
  
      int offset = 0;
***************
*** 49,52 ****
--- 51,58 ----
    }
  
+   public int getQueryID() {
+     return queryID;
+   }
+ 
    public void setTTL(int ttl) {
      this.ttl = ttl;
***************
*** 61,64 ****
--- 67,74 ----
    }
  
+   public ArrayList getByteArray(int columnIndex) {
+     return (ArrayList) byteValueList.get(columnIndex);
+   }
+ 
    public int getInt(int columnIndex) {
      return getUIntElement((ArrayList)byteValueList.get(columnIndex));
***************
*** 68,75 ****
      ArrayList theValue = (ArrayList)byteValueList.get(columnIndex);
      char[] theString = new char[theValue.size()];
      for(int i = 0; i < theValue.size(); i++) {
!       theString[i] = (char) ubyte(((Integer)theValue.get(i)).intValue());
      }
!     return new String(theString);
    }
  
--- 78,90 ----
      ArrayList theValue = (ArrayList)byteValueList.get(columnIndex);
      char[] theString = new char[theValue.size()];
+     int j = 0;
      for(int i = 0; i < theValue.size(); i++) {
!       char theChar = (char) ubyte(((Integer)theValue.get(i)).intValue());
!       if (theChar != 0) {
! 	theString[j] = theChar;
! 	j++;
!       }
      }
!     return new String(theString).substring(0,j);
    }
  
***************
*** 77,80 ****
--- 92,96 ----
      String ret = ""; 
      ArrayList theValue = (ArrayList)byteValueList.get(columnIndex);    
+     
      for(int i = 0; i < theValue.size(); i++) {
        ret += toByteString(ubyte(((Integer)theValue.get(i)).intValue()));