[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork Driver.c, 1.1.2.3, 1.1.2.4 TestNetwork.h, 1.1.2.4, 1.1.2.5 TestNetworkC.nc, 1.1.2.12, 1.1.2.13 test.py, 1.1.2.5, 1.1.2.6 tn-listener.c, 1.1.2.1, 1.1.2.2

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2782

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Driver.c TestNetwork.h TestNetworkC.nc test.py tn-listener.c 
Log Message:
A more functional test application.


Index: Driver.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/Driver.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Driver.c	10 Jun 2006 21:19:50 -0000	1.1.2.3
--- Driver.c	19 Jun 2006 21:21:38 -0000	1.1.2.4
***************
*** 14,25 ****
  
  
!  // t->addChannel("Gain", stdout);
   t->addChannel("Forwarder", stdout);
!  t->addChannel("PointerBug", stdout);
!  t->addChannel("QueueC", stdout);
!  t->addChannel("PoolP", stdout);
   //t->addChannel("LITest", stdout);
   //t->addChannel("AM", stdout);
!  t->addChannel("Route", stdout);
  
   Radio* r = t->radio();
--- 14,25 ----
  
  
!  t->addChannel("TestNetworkC", stdout);
   t->addChannel("Forwarder", stdout);
! // t->addChannel("PointerBug", stdout);
! // t->addChannel("QueueC", stdout);
! // t->addChannel("PoolP", stdout);
   //t->addChannel("LITest", stdout);
   //t->addChannel("AM", stdout);
! // t->addChannel("Route", stdout);
  
   Radio* r = t->radio();

Index: TestNetwork.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetwork.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** TestNetwork.h	16 Jun 2006 12:55:23 -0000	1.1.2.4
--- TestNetwork.h	19 Jun 2006 21:21:38 -0000	1.1.2.5
***************
*** 12,15 ****
--- 12,17 ----
    nx_uint16_t data;
    nx_uint8_t hopcount;
+   nx_uint16_t sendCount;
+   nx_uint16_t sendSuccessCount;
  } TestNetworkMsg;
  

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkC.nc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** TestNetworkC.nc	16 Jun 2006 12:55:23 -0000	1.1.2.12
--- TestNetworkC.nc	19 Jun 2006 21:21:38 -0000	1.1.2.13
***************
*** 57,63 ****
        }
        seqno = 0;
!       if (TOS_NODE_ID == 142) {
!       	call Timer.startOneShot(call Random.rand16() & 0x7FFF);
!       }
      }
    }
--- 57,61 ----
        }
        seqno = 0;
!       call Timer.startOneShot(call Random.rand16() & 0x1ff);
      }
    }
***************
*** 68,71 ****
--- 66,70 ----
    event void Timer.fired() {
      call Leds.led0Toggle();
+     dbg("TestNetworkC", "TestNetworkC: Timer fired.\n");
      if (firstTimer) {
        firstTimer = FALSE;
***************
*** 76,80 ****
        return;
      }
-     //dbg("TestNetworkC", "TestDisseminationC: Timer fired.\n");
      busy = TRUE;
    }
--- 75,78 ----

Index: test.py
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/test.py,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** test.py	14 Jun 2006 20:51:17 -0000	1.1.2.5
--- test.py	19 Jun 2006 21:21:38 -0000	1.1.2.6
***************
*** 9,13 ****
  r = t.radio()
  
! f = open("topo.10x10.txt", "r")
  lines = f.readlines()
  for line in lines:
--- 9,13 ----
  r = t.radio()
  
! f = open("sparse-grid.txt", "r")
  lines = f.readlines()
  for line in lines:
***************
*** 19,23 ****
        r.setNoise(int(s[1]), float(s[2]), float(s[3]))
  
! for i in range(0, 100):
    m = t.getNode(i);
    time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
--- 19,23 ----
        r.setNoise(int(s[1]), float(s[2]), float(s[3]))
  
! for i in range(0, 10):
    m = t.getNode(i);
    time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
***************
*** 28,40 ****
  
  #t.addChannel("AM", sys.stdout)
! t.addChannel("TreeRouting", sys.stdout)
! t.addChannel("TestNetworkC", sys.stdout)
  #t.addChannel("TestNetworkC", sys.stdout)
! t.addChannel("Route", sys.stdout)
! t.addChannel("PointerBug", sys.stdout)
! t.addChannel("QueueC", sys.stdout)
  #t.addChannel("Gain", sys.stdout)
  t.addChannel("Forwarder", sys.stdout)
! t.addChannel("Acks", sys.stdout)
  
  while (t.time() < 1000 * t.ticksPerSecond()):
--- 28,42 ----
  
  #t.addChannel("AM", sys.stdout)
! #t.addChannel("TreeRouting", sys.stdout)
  #t.addChannel("TestNetworkC", sys.stdout)
! #t.addChannel("Route", sys.stdout)
! #t.addChannel("PointerBug", sys.stdout)
! #t.addChannel("QueueC", sys.stdout)
  #t.addChannel("Gain", sys.stdout)
  t.addChannel("Forwarder", sys.stdout)
! t.addChannel("TestNetworkC", sys.stdout)
! #t.addChannel("App", sys.stdout)
! #t.addChannel("Traffic", sys.stdout)
! #t.addChannel("Acks", sys.stdout)
  
  while (t.time() < 1000 * t.ticksPerSecond()):

Index: tn-listener.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/tn-listener.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** tn-listener.c	7 Jun 2006 21:25:44 -0000	1.1.2.1
--- tn-listener.c	19 Jun 2006 21:21:38 -0000	1.1.2.2
***************
*** 14,18 ****
    int fd,i;
  
!   if (argc != 5) {
      fprintf(stderr, "Usage: %s <host> <port> - print received packets\n", argv[0]);
      exit(2);
--- 14,18 ----
    int fd,i;
  
!   if (argc != 3) {
      fprintf(stderr, "Usage: %s <host> <port> - print received packets\n", argv[0]);
      exit(2);