[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/opcodes OPgetAgents.nc, 1.2, 1.3 OPgetAgentsM.nc, 1.5, 1.6 OPgetClosestAgent.nc, 1.3, 1.4 OPgetClosestAgentM.nc, 1.10, 1.11 OPgetlocation.nc, 1.5, 1.6 OPgetlocationM.nc, 1.9, 1.10

Chien-Liang Fok chien-liang at users.sourceforge.net
Mon Apr 10 21:03:13 PDT 2006 

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

Modified Files:
	OPgetAgents.nc OPgetAgentsM.nc OPgetClosestAgent.nc 
	OPgetClosestAgentM.nc OPgetlocation.nc OPgetlocationM.nc 
Log Message:


Index: OPgetAgents.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetAgents.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OPgetAgents.nc	7 Apr 2006 01:14:53 -0000	1.2
--- OPgetAgents.nc	11 Apr 2006 04:03:11 -0000	1.3
***************
*** 64,67 ****
--- 64,74 ----
    #endif
  
+   #if ENABLE_EXP_LOGGING
+     components ExpLoggerC;
+     #ifdef _H_msp430hardware_h
+       components LocalTimeMicroC;
+     #endif
+   #endif    
+ 
    BytecodeI = OPgetAgents;
  
***************
*** 94,97 ****
--- 101,110 ----
    #endif
  
+   #if ENABLE_EXP_LOGGING
+     OPgetAgents.ExpLoggerI -> ExpLoggerC;
+     #ifdef _H_msp430hardware_h
+       OPgetAgents.LocalTime -> LocalTimeMicroC;
+     #endif
+   #endif  
  }
  

Index: OPgetAgentsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetAgentsM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OPgetAgentsM.nc	7 Apr 2006 01:14:53 -0000	1.5
--- OPgetAgentsM.nc	11 Apr 2006 04:03:11 -0000	1.6
***************
*** 70,73 ****
--- 70,80 ----
      interface Timer as Timeout;
      interface Leds; // debug
+ 
+     #if ENABLE_EXP_LOGGING
+       interface ExpLoggerI;
+       #ifdef _H_msp430hardware_h
+         interface LocalTime;
+       #endif
+     #endif    
    }
  }
***************
*** 115,118 ****
--- 122,129 ----
    uint16_t _agent_type;
  
+   #if ENABLE_EXP_LOGGING
+     uint32_t _start;
+   #endif
+   
    command result_t StdControl.init()
    {
***************
*** 133,136 ****
--- 144,161 ----
    inline result_t finish(result_t success)
    {
+ 
+     #if ENABLE_EXP_LOGGING
+       if (success) {
+         #ifdef _H_msp430hardware_h
+           _start = call LocalTime.read() - _start;
+         #else
+           _start = 0;
+         #endif
+       } else {
+         _start = 0;
+       }
+       call ExpLoggerI.sendQueryLatency(_start);
+     #endif
+     
      _currAgent->condition = (uint16_t)success;
      call AgentMgrI.run(_currAgent);
***************
*** 197,202 ****
  
          call MessageBufferI.freeMsg(msg);
!       else
          call Timeout.start(TIMER_ONE_SHOT, TIMEOUT_GET_NUM_AGENTS);
      }
    } // task doSendQuery()
--- 222,238 ----
  
          call MessageBufferI.freeMsg(msg);
!       else {
!         #if ENABLE_EXP_LOGGING
!           AgillaLocation loc;
!           loc.x = loc.y = 0;
!           call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, QUERY_GET_AGENTS_ISSUED, qMsg->qid, qMsg->agent_type, loc);
!           #ifdef _H_msp430hardware_h
!             _start = call LocalTime.read();
!           #else
!             _start = 0;
!           #endif
!         #endif      
          call Timeout.start(TIMER_ONE_SHOT, TIMEOUT_GET_NUM_AGENTS);
+       }
      }
    } // task doSendQuery()
***************
*** 317,320 ****
--- 353,360 ----
          }
  
+         #if ENABLE_EXP_LOGGING
+           call ExpLoggerI.sendGetAgentsResultsTrace(reply);
+         #endif        
+ 
          // See if there are more results expected
          if (reply->num_agents <= MAX_AGENT_NUM || _max == _num_agents)
***************
*** 340,343 ****
--- 380,391 ----
          if (!call SendResults.send(oneHopDest, sizeof(AgillaQueryReplyAllAgentsMsg), msg))
            call MessageBufferI.freeMsg(msg);
+         else 
+         {
+           #if ENABLE_EXP_LOGGING
+             AgillaLocation loc;
+             loc.x = loc.y = 0;
+             call ExpLoggerI.sendTraceQid(reply->agent_id.id, TOS_LOCAL_ADDRESS, QUERY_GET_AGENTS_RESULTS_FORWARDED, reply->qid, SUCCESS, loc);
+           #endif        
+         }
        }
      }
***************
*** 347,350 ****
--- 395,405 ----
    event result_t Timeout.fired()
    {
+ 
+     #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), FAIL, loc);
+     #endif
+     
      #if DEBUG_OP_GET_AGENTS
        dbg(DBG_USR1, "OPgetAgentsM: ERROR: Timed out while waiting for results.\n");
***************
*** 365,368 ****
--- 420,432 ----
        if (!sendQueryMsg(msg))
          call MessageBufferI.freeMsg(msg);
+       else
+       {
+         #if ENABLE_EXP_LOGGING
+           struct AgillaQueryAllAgentsMsg *qMsg = (struct AgillaQueryAllAgentsMsg *)msg->data;
+           AgillaLocation loc;
+           call LocationMgrI.getLocation(qMsg->dest, &loc);
+           call ExpLoggerI.sendTraceQid(qMsg->agent_id.id, TOS_LOCAL_ADDRESS, QUERY_GET_AGENTS_RESULTS_FORWARDED, qMsg->qid, SUCCESS, loc);
+         #endif      
+       }
      }
      return m;

Index: OPgetClosestAgent.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetClosestAgent.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OPgetClosestAgent.nc	10 Apr 2006 06:16:36 -0000	1.3
--- OPgetClosestAgent.nc	11 Apr 2006 04:03:11 -0000	1.4
***************
*** 67,71 ****
    #if ENABLE_EXP_LOGGING
      components ExpLoggerC;
!     components LocalTimeMicroC;
    #endif  
  
--- 67,73 ----
    #if ENABLE_EXP_LOGGING
      components ExpLoggerC;
!     #ifdef _H_msp430hardware_h
!       components LocalTimeMicroC;
!     #endif
    #endif  
  
***************
*** 102,106 ****
    #if ENABLE_EXP_LOGGING
      OPgetClosestAgent.ExpLoggerI -> ExpLoggerC;
!     OPgetClosestAgent.LocalTime -> LocalTimeMicroC;
    #endif  
  }
--- 104,110 ----
    #if ENABLE_EXP_LOGGING
      OPgetClosestAgent.ExpLoggerI -> ExpLoggerC;
!     #ifdef _H_msp430hardware_h
!       OPgetClosestAgent.LocalTime -> LocalTimeMicroC;
!     #endif
    #endif  
  }

Index: OPgetClosestAgentM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetClosestAgentM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OPgetClosestAgentM.nc	10 Apr 2006 06:16:36 -0000	1.10
--- OPgetClosestAgentM.nc	11 Apr 2006 04:03:11 -0000	1.11
***************
*** 73,77 ****
      #if ENABLE_EXP_LOGGING
        interface ExpLoggerI;
!       interface LocalTime;
      #endif    
    }
--- 73,79 ----
      #if ENABLE_EXP_LOGGING
        interface ExpLoggerI;
!       #ifdef _H_msp430hardware_h
!         interface LocalTime;
!       #endif
      #endif    
    }
***************
*** 139,143 ****
      #if ENABLE_EXP_LOGGING
        if (success) {
!         _start = call LocalTime.read() - _start;
        } else {
          _start = 0;
--- 141,149 ----
      #if ENABLE_EXP_LOGGING
        if (success) {
!         #ifdef _H_msp430hardware_h
!           _start = call LocalTime.read() - _start;
!         #else
!           _start = 0;
!         #endif
        } else {
          _start = 0;
***************
*** 216,220 ****
            call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, 
              QUERY_GET_CLOSEST_AGENT_ISSUED, qMsg->qid, SUCCESS, qMsg->loc);
!           _start = call LocalTime.read();
          #endif      
          call Timeout.start(TIMER_ONE_SHOT, TIMEOUT_GET_NUM_AGENTS);
--- 222,228 ----
            call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, 
              QUERY_GET_CLOSEST_AGENT_ISSUED, qMsg->qid, SUCCESS, qMsg->loc);
!           #ifdef _H_msp430hardware_h
!             _start = call LocalTime.read();
!           #endif
          #endif      
          call Timeout.start(TIMER_ONE_SHOT, TIMEOUT_GET_NUM_AGENTS);

Index: OPgetlocation.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetlocation.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OPgetlocation.nc	10 Apr 2006 06:16:36 -0000	1.5
--- OPgetlocation.nc	11 Apr 2006 04:03:11 -0000	1.6
***************
*** 67,71 ****
    #if ENABLE_EXP_LOGGING
      components ExpLoggerC;
!     components LocalTimeMicroC;
    #endif
  
--- 67,73 ----
    #if ENABLE_EXP_LOGGING
      components ExpLoggerC;
!     #ifdef _H_msp430hardware_h
!       components LocalTimeMicroC;
!     #endif
    #endif
  
***************
*** 101,106 ****
  
    #if ENABLE_EXP_LOGGING
!   OPgetlocation.ExpLoggerI -> ExpLoggerC;
!   OPgetlocation.LocalTime -> LocalTimeMicroC;
    #endif
  
--- 103,110 ----
  
    #if ENABLE_EXP_LOGGING
!     OPgetlocation.ExpLoggerI -> ExpLoggerC;
!       #ifdef _H_msp430hardware_h  
!         OPgetlocation.LocalTime -> LocalTimeMicroC;
!       #endif
    #endif
  

Index: OPgetlocationM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetlocationM.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OPgetlocationM.nc	10 Apr 2006 06:16:36 -0000	1.9
--- OPgetlocationM.nc	11 Apr 2006 04:03:11 -0000	1.10
***************
*** 73,77 ****
      #if ENABLE_EXP_LOGGING
        interface ExpLoggerI;
!       interface LocalTime;
      #endif
    }
--- 73,79 ----
      #if ENABLE_EXP_LOGGING
        interface ExpLoggerI;
!       #ifdef _H_msp430hardware_h
!         interface LocalTime;
!       #endif
      #endif
    }
***************
*** 130,134 ****
      #if ENABLE_EXP_LOGGING
        if (success) {
!         _start = call LocalTime.read() - _start;
        } else {
          _start = 0;
--- 132,140 ----
      #if ENABLE_EXP_LOGGING
        if (success) {
!         #ifdef _H_msp430hardware_h
!           _start = call LocalTime.read() - _start;
!         #else
!           _start = 0;
!         #endif
        } else {
          _start = 0;
***************
*** 207,211 ****
            loc.x = loc.y = 0;
            call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, QUERY_GET_LOCATION_ISSUED, qMsg->qid, qMsg->find_agent_id.id, loc);
!           _start = call LocalTime.read();
          #endif
          call Timeout.start(TIMER_ONE_SHOT, TIMEOUT_GET_LOCATION);
--- 213,219 ----
            loc.x = loc.y = 0;
            call ExpLoggerI.sendTraceQid(_currAgent->id.id, TOS_LOCAL_ADDRESS, QUERY_GET_LOCATION_ISSUED, qMsg->qid, qMsg->find_agent_id.id, loc);
!           #ifdef _H_msp430hardware_h
!             _start = call LocalTime.read();
!           #endif
          #endif
          call Timeout.start(TIMER_ONE_SHOT, TIMEOUT_GET_LOCATION);

More information about the Tinyos-contrib-commits mailing list