[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip Drip.java, 1.5, 1.6 Makefile, 1.2, 1.3

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19792/tools/java/net/tinyos/drip

Modified Files:
	Drip.java Makefile 
Log Message:
Extending the DripSend directed dissemination system. DripSendC is now generic -- instantiate it with the Drip channel you want to do directed dissemination on. Also, the Drip java tools have been enhanced a bit to support sending into the network unreliably.

Index: Drip.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip/Drip.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Drip.java	15 Jul 2005 22:21:25 -0000	1.5
--- Drip.java	16 Jul 2005 01:29:47 -0000	1.6
***************
*** 93,96 ****
--- 93,114 ----
    }
  
+   public synchronized void sendUnreliable(Message msg, int msgSize) {
+     trickle = new Timer();
+     trickleTask = new DripSender();
+     dripMsg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + msgSize);
+     dripMsg.dataSet(msg.dataGet(), 0, dripMsg.offset_data(0),
+ 		    msgSize);
+     sendCount = 0;
+     state = SENDING_NEW;
+     wakeupMsg = false;
+     maxSendCount = SEND_COUNT;
+     trickle.schedule(trickleTask, 0, SEND_RATE);
+     try {
+       wait();
+     } catch (InterruptedException e) {
+       // return
+     }
+   }
+ 
    public synchronized void sendWakeup(Message msg, int msgSize) {
      trickle = new Timer();

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	16 Mar 2005 22:51:41 -0000	1.2
--- Makefile	16 Jul 2005 01:29:47 -0000	1.3
***************
*** 6,10 ****
  
  # List of message classes to build
! MSGS = DripMsg.java TestDripMsg.java
  CONSTS = DripConsts.java
  INITIAL_TARGETS = $(MSGS) $(CONSTS)
--- 6,10 ----
  
  # List of message classes to build
! MSGS = DripMsg.java AddressMsg.java TestDripMsg.java
  CONSTS = DripConsts.java
  INITIAL_TARGETS = $(MSGS) $(CONSTS)
***************
*** 18,21 ****
--- 18,24 ----
  	$(MIG) -java-classname=$(PACKAGE).DripMsg $(LIB)/Drip.h DripMsg -o $@
  
+ AddressMsg.java: $(LIB)/DripSend.h
+ 	$(MIG) -java-classname=$(PACKAGE).AddressMsg $(LIB)/DripSend.h AddressMsg -o $@
+ 
  DripConsts.java: $(LIB)/Drip.h
  	$(NCG) -java-classname=$(PACKAGE).DripConsts -I$(LIB) $(LIB)/Drip.h Drip.h -o $@