[Tinyos-beta-commits]
CVS: tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain
Drain.java, 1.8, 1.9 DrainConnector.java, 1.4, 1.5 Makefile,
1.2, 1.3
Gilman Tolle
gtolle at users.sourceforge.net
Sat Jul 16 14:26:37 PDT 2005
Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7636/tools/java/net/tinyos/drain
Modified Files:
Drain.java DrainConnector.java Makefile
Log Message:
Switched from System.out to log4j for logging. Added DrainGroupRegisterMsg to Makefile, to support Clog.
Index: Drain.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/Drain.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Drain.java 8 Jul 2005 21:04:43 -0000 1.8
--- Drain.java 16 Jul 2005 21:26:35 -0000 1.9
***************
*** 4,7 ****
--- 4,9 ----
import net.tinyos.util.*;
+ import org.apache.log4j.*;
+
import java.io.*;
import java.text.*;
***************
*** 10,15 ****
public class Drain {
- public boolean DEBUG = false;
public boolean VERBOSE = true;
private static int DRAIN_MAX_CHILDREN = 8;
--- 12,17 ----
public class Drain {
public boolean VERBOSE = true;
+ private Logger log = Logger.getLogger(Drain.class.getName());
private static int DRAIN_MAX_CHILDREN = 8;
***************
*** 35,39 ****
spAddr = DrainLib.setSPAddr();
moteIF = DrainLib.startMoteIF();
- moteIF.registerListener(new DrainMsg(), new DrainListener());
}
--- 37,40 ----
***************
*** 41,45 ****
spAddr = p_spAddr;
moteIF = p_moteIF;
- moteIF.registerListener(new DrainMsg(), new DrainListener());
}
--- 42,45 ----
***************
*** 57,60 ****
--- 57,62 ----
DrainBeaconMsg beaconMsg = new DrainBeaconMsg();
+ log.info("buildTree: instance=" + treeInstance + " delay=" + delay + " defaultRoute=" + defaultRoute);
+
children.clear();
children.add(new Integer(0));
***************
*** 85,105 ****
}
- private class DrainListener implements MessageListener {
-
- synchronized public void messageReceived(int to, Message m) {
-
- DrainMsg mhMsg = (DrainMsg)m;
-
- if (DEBUG) {
- System.out.println(" linkTo: " + to +
- " type:" + mhMsg.get_type() +
- " hops:" + (16 - mhMsg.get_ttl()) +
- " source:" + mhMsg.get_source() +
- " dest:" + mhMsg.get_dest());
- }
- }
- }
-
-
public synchronized void send(Message m) {
sendTo(MoteIF.TOS_BCAST_ADDR, m);
--- 87,90 ----
Index: DrainConnector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/DrainConnector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DrainConnector.java 25 Jun 2005 22:40:58 -0000 1.4
--- DrainConnector.java 16 Jul 2005 21:26:35 -0000 1.5
***************
*** 4,7 ****
--- 4,9 ----
import net.tinyos.util.*;
+ import org.apache.log4j.*;
+
import java.io.*;
import java.text.*;
***************
*** 11,16 ****
public class DrainConnector implements MessageListener {
- private static int DEBUG = 0;
-
public static int TOS_UART_ADDR = 0x7e;
public static int DEFAULT_MOTE_ID = 0xfffe;
--- 13,16 ----
***************
*** 18,22 ****
private MoteIF moteIF;
!
private int spAddr;
--- 18,24 ----
private MoteIF moteIF;
!
! private Logger log = Logger.getLogger(DrainConnector.class.getName());
!
private int spAddr;
***************
*** 27,30 ****
--- 29,33 ----
moteIF = DrainLib.startMoteIF();
moteIF.registerListener(new DrainMsg(), this);
+ log.info("Started myAddr = " + spAddr + ", listening for DrainMsg");
}
***************
*** 35,42 ****
}
- public void setDebug(int level) {
- DEBUG = level;
- }
-
public void registerListener(int id, MessageListener m) {
HashSet listenerSet = (HashSet) idTable.get(new Integer(id));
--- 38,41 ----
***************
*** 47,50 ****
--- 46,50 ----
}
listenerSet.add(m);
+ log.info("New Listener for id=" + id);
}
***************
*** 62,76 ****
DrainMsg mhMsg = (DrainMsg)m;
! if (DEBUG > 0) {
! System.err.println(" localDest: " + to +
! " type:" + mhMsg.get_type() +
! " hops:" + (16 - mhMsg.get_ttl()) +
! " source:" + mhMsg.get_source() +
! " finalDest:" + mhMsg.get_dest());
! }
if (to != spAddr && to != MoteIF.TOS_BCAST_ADDR && to != TOS_UART_ADDR) {
! if (DEBUG > 1)
! System.err.println("Dropping message not for me.");
return;
}
--- 62,73 ----
DrainMsg mhMsg = (DrainMsg)m;
! log.debug("incoming: localDest: " + to +
! " type:" + mhMsg.get_type() +
! " hops:" + (16 - mhMsg.get_ttl()) +
! " source:" + mhMsg.get_source() +
! " finalDest:" + mhMsg.get_dest());
if (to != spAddr && to != MoteIF.TOS_BCAST_ADDR && to != TOS_UART_ADDR) {
! log.debug("Dropping message not for me.");
return;
}
***************
*** 86,93 ****
if (listenerSet == null) {
! if (DEBUG > 2) {
! System.out.println("No Listener for type: " + mhMsg.get_type());
! System.out.println(mhMsg);
! }
return;
}
--- 83,87 ----
if (listenerSet == null) {
! log.debug("No Listener for type: " + mhMsg.get_type());
return;
}
***************
*** 101,105 ****
public static void main(String args[]) {
DrainConnector dc = new DrainConnector();
- dc.setDebug(1);
}
}
--- 95,98 ----
Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 12 Jun 2005 13:38:03 -0000 1.2
--- Makefile 16 Jul 2005 21:26:35 -0000 1.3
***************
*** 7,11 ****
# List of message classes to build
! MSGS = DrainMsg.java DrainBeaconMsg.java DrainConsts.java
CONSTS =
INITIAL_TARGETS = $(MSGS) $(CONSTS)
--- 7,11 ----
# List of message classes to build
! MSGS = DrainMsg.java DrainBeaconMsg.java DrainGroupRegisterMsg.java DrainConsts.java
CONSTS =
INITIAL_TARGETS = $(MSGS) $(CONSTS)
***************
*** 21,24 ****
--- 21,27 ----
$(MIG) -java-classname=$(PACKAGE).DrainBeaconMsg $(BETA)/Drain/Drain.h DrainBeaconMsg -o $@
+ DrainGroupRegisterMsg.java: $(BETA)/Drain/Drain.h
+ $(MIG) -java-classname=$(PACKAGE).DrainGroupRegisterMsg $(BETA)/Drain/Drain.h DrainGroupRegisterMsg -o $@
+
DrainConsts.java: $(BETA)/Drain/Drain.h
$(NCG) -java-classname=$(PACKAGE).DrainConsts -I$(BETA)/Drain $(BETA)/Drain/Drain.h Drain.h -o $@
More information about the Tinyos-beta-commits
mailing list