[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/opcodes OPgetAgentsM.nc, 1.6, 1.7

[Chien-Liang Fok]

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

Modified Files:
	OPgetAgentsM.nc 
Log Message:


Index: OPgetAgentsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetAgentsM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OPgetAgentsM.nc	11 Apr 2006 04:03:11 -0000	1.6
--- OPgetAgentsM.nc	12 Apr 2006 19:30:48 -0000	1.7
***************
*** 117,125 ****
    uint16_t _agent_type;
  
-   /**
-    * The type of the agent being searched for.
-    */
-   uint16_t _agent_type;
- 
    #if ENABLE_EXP_LOGGING
      uint32_t _start;
--- 117,120 ----
***************
*** 359,363 ****
          // See if there are more results expected
          if (reply->num_agents <= MAX_AGENT_NUM || _max == _num_agents)
!         {
            call OpStackI.pushValue(_currAgent, _num_agents);
            finish(SUCCESS);
--- 354,364 ----
          // See if there are more results expected
          if (reply->num_agents <= MAX_AGENT_NUM || _max == _num_agents)
!         {          
!           #if ENABLE_EXP_LOGGING
!             AgillaLocation loc;
!             loc.x = loc.y = 0;
!             call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, QUERY_GET_AGENTS_RESULT_RECEIVED, 
!               ((TOS_LOCAL_ADDRESS & 0xff) << 8) | (_qid-1), SUCCESS, loc);
!           #endif          
            call OpStackI.pushValue(_currAgent, _num_agents);
            finish(SUCCESS);
***************
*** 399,403 ****
        AgillaLocation loc;
        loc.x = loc.y = 0;
!       call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, QUERY_GET_AGENTS_RESULT_RECEIVED, ((TOS_LOCAL_ADDRESS & 0xff) << 8) | (_qid-1), FAIL, loc);
      #endif
      
--- 400,405 ----
        AgillaLocation loc;
        loc.x = loc.y = 0;
!       call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, QUERY_GET_AGENTS_RESULT_RECEIVED, 
!         ((TOS_LOCAL_ADDRESS & 0xff) << 8) | (_qid-1), FAIL, loc);
      #endif