[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components AgentMgrM.nc, 1.24, 1.25 ExpLoggerM.nc, 1.2, 1.3

[Chien-Liang Fok]

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

Modified Files:
	AgentMgrM.nc ExpLoggerM.nc 
Log Message:
Added some trace messages

Index: AgentMgrM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/AgentMgrM.nc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** AgentMgrM.nc	7 Apr 2006 01:14:35 -0000	1.24
--- AgentMgrM.nc	8 Apr 2006 21:27:33 -0000	1.25
***************
*** 252,255 ****
--- 252,261 ----
      AgillaAgentID id = context->id;
  
+     #if ENABLE_EXP_LOGGING
+       AgillaLocation loc;
+       call LocationMgrI.getLocation(final_dest, &loc);
+       call ExpLoggerI.sendTrace(context->id.id, TOS_LOCAL_ADDRESS, AGENT_MIGRATING, SUCCESS, loc);
+     #endif
+ 
      if (dest == TOS_LOCAL_ADDRESS) // agent migrates to self
      {

Index: ExpLoggerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ExpLoggerM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExpLoggerM.nc	7 Apr 2006 01:14:35 -0000	1.2
--- ExpLoggerM.nc	8 Apr 2006 21:27:33 -0000	1.3
***************
*** 61,64 ****
--- 61,70 ----
    command result_t ExpLoggerI.sendTrace(uint16_t agentID, uint16_t nodeID,
      uint16_t action, uint16_t success, AgillaLocation loc)
+   {   
+     return call ExpLoggerI.sendTraceQid(agentID, nodeID, action, 0, success, loc);
+   }
+ 
+   command result_t ExpLoggerI.sendTraceQid(uint16_t agentID, uint16_t nodeID,
+     uint16_t action, uint16_t qid, uint16_t success, AgillaLocation loc)
    {
      TOS_MsgPtr msg = call MessageBufferI.getMsg();
***************
*** 70,73 ****
--- 76,80 ----
        traceMsg->nodeID = nodeID;
        traceMsg->action = action;
+       traceMsg->qid = qid;
        traceMsg->success = success;
        traceMsg->loc = loc;
***************
*** 76,80 ****
      }
      return SUCCESS;
!   }
  
    command result_t ExpLoggerI.sendSetCluster(uint16_t newClusterHead)
--- 83,87 ----
      }
      return SUCCESS;
!   }  
  
    command result_t ExpLoggerI.sendSetCluster(uint16_t newClusterHead)