[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components/NetworkInterface NetworkInterfaceC.nc, 1.3, 1.4 NetworkInterfaceM.nc, 1.8, 1.9

[Chien-Liang Fok]

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

Modified Files:
	NetworkInterfaceC.nc NetworkInterfaceM.nc 
Log Message:


Index: NetworkInterfaceC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/NetworkInterface/NetworkInterfaceC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NetworkInterfaceC.nc	28 Mar 2006 01:50:53 -0000	1.3
--- NetworkInterfaceC.nc	5 Apr 2006 18:04:38 -0000	1.4
***************
*** 59,62 ****
--- 59,66 ----
      components CC1000RadioC;
    #endif
+   
+   #if ENABLE_EXP_LOGGING
+     components ExpLoggerC;
+   #endif
  
    //components ContextMgrProxy as CntxtMgr;
***************
*** 79,82 ****
--- 83,90 ----
      NIM.MacControl -> CC1000RadioC;
    #endif
+   
+   #if ENABLE_EXP_LOGGING
+     NIM.ExpLoggerI -> ExpLoggerC;
+   #endif  
  
    //MultiHopRouter.ReceiveMsg -> CommP;

Index: NetworkInterfaceM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/NetworkInterface/NetworkInterfaceM.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NetworkInterfaceM.nc	28 Mar 2006 01:50:53 -0000	1.8
--- NetworkInterfaceM.nc	5 Apr 2006 18:04:38 -0000	1.9
***************
*** 39,42 ****
--- 39,47 ----
  includes TupleSpace;
  
+ #if ENABLE_EXP_LOGGING
+   includes ExpLogger;
+   includes LocationDirectory;
+ #endif
+ 
  /**
   * Serializes the sending of messages.  This is required
***************
*** 67,70 ****
--- 72,76 ----
      interface ReceiveMsg[uint8_t id];
      interface MessageBufferI;
+     
      interface CC2420Control;
      #ifdef TOSH_HARDWARE_MICA2
***************
*** 72,75 ****
--- 78,85 ----
        //interface CC1000Control;  // used to reduce the radio range
      #endif
+     
+     #if ENABLE_EXP_LOGGING
+       interface ExpLoggerI;
+     #endif
    }
  }
***************
*** 292,295 ****
--- 302,315 ----
        dbg(DBG_USR1, "NetworkInterfaceM: BufferedSendMsg.send(): Begin method call...\n");
      #endif
+     
+     #if ENABLE_EXP_LOGGING
+       if (id == AM_AGILLAQUERYNUMAGENTSMSG ||
+           id == AM_AGILLAQUERYAGENTLOCMSG ||
+           id == AM_AGILLAQUERYNEARESTAGENTMSG ||
+           id == AM_AGILLAQUERYALLAGENTSMSG)
+         call ExpLoggerI.incQueryMsg();
+       else if (id == AM_AGILLALOCMSG)
+         call ExpLoggerI.incNumUpdates();
+     #endif
  
      if (!sbuf[head].used) {  // if there is space in the send queue