[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components ExpLoggerM.nc, 1.5, 1.6 RemoteTSOpMgrM.nc, 1.19, 1.20

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17119/components

Modified Files:
	ExpLoggerM.nc RemoteTSOpMgrM.nc 
Log Message:


Index: ExpLoggerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ExpLoggerM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExpLoggerM.nc	11 Apr 2006 06:18:18 -0000	1.5
--- ExpLoggerM.nc	20 Apr 2006 22:05:58 -0000	1.6
***************
*** 17,21 ****
  implementation {
  
!   uint16_t _numQueries, _numUpdates, _numReplies;
  
    command result_t StdControl.init() {
--- 17,21 ----
  implementation {
  
!   //uint16_t _numQueries, _numUpdates, _numReplies;
  
    command result_t StdControl.init() {
***************
*** 33,43 ****
  
    command result_t ExpLoggerI.reset() {
!     _numQueries = 0;
      _numUpdates = 0;
!     _numReplies = 0;
      return SUCCESS;
    }
  
!   command result_t ExpLoggerI.incQueryMsg() {
      _numQueries++;
      return SUCCESS;
--- 33,43 ----
  
    command result_t ExpLoggerI.reset() {
!     /*_numQueries = 0;
      _numUpdates = 0;
!     _numReplies = 0;*/
      return SUCCESS;
    }
  
! /*  command result_t ExpLoggerI.incQueryMsg() {
      _numQueries++;
      return SUCCESS;
***************
*** 53,56 ****
--- 53,57 ----
      return SUCCESS;
    }
+ */
  
    command result_t ExpLoggerI.sendQueryLatency(uint32_t latency) {
***************
*** 137,141 ****
     * This task is executed when a query is received.
     */
!   task void sendResults() {
      TOS_MsgPtr msg = call MessageBufferI.getMsg();
      if (msg != NULL)
--- 138,142 ----
     * This task is executed when a query is received.
     */
! /*  task void sendResults() {
      TOS_MsgPtr msg = call MessageBufferI.getMsg();
      if (msg != NULL)
***************
*** 149,153 ****
--- 150,156 ----
      }
    }
+ */
  
+ /*
    event TOS_MsgPtr ReceiveQuery.receive(TOS_MsgPtr m)
    {
***************
*** 158,161 ****
--- 161,165 ----
      return m;
    }
+ */
  
    event result_t SendLatency.sendDone(TOS_MsgPtr m, result_t success)

Index: RemoteTSOpMgrM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/RemoteTSOpMgrM.nc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** RemoteTSOpMgrM.nc	28 Mar 2006 01:50:53 -0000	1.19
--- RemoteTSOpMgrM.nc	20 Apr 2006 22:05:58 -0000	1.20
***************
*** 394,399 ****
        }
      }
!     //else
!     //  bounceMsg(results->dest, m);
      return m;
  
--- 394,399 ----
        }
      }
!     else
!       bounceMsg(results->dest, m);
      return m;