Changeset 231

Timestamp:

10/20/09 16:57:43 (4 years ago)

Author:

thomas

Message:

temp

Location:

apps/TSCH

Files:

• TODO.txt (modified) (1 diff)
• TSCH.h (modified) (1 diff)
• TSCHP.nc (modified) (3 diffs)
• advertise/AdvertiseP.nc (modified) (2 diffs)
• deploy.sh (modified) (1 diff)
• neighbors/NeighborsP.nc (modified) (2 diffs)
• reservation/ReservationP.nc (modified) (4 diffs)

apps/TSCH/TODO.txt

@@ -1 @@
-- slots get crazy
 - when a node reboots, it forgets all its RES slots. So should its neighbors.
 - when a node gets out of sync, it keeps its tables. If it stays out of sync for over delays, it should erase its tables.

apps/TSCH/TSCH.h

@@ -11 +11 @@
    RESRETRIES = 5,
    DELAY_REMOVE_FROZEN_RESERVATIONS =10000,  //in ms
-   DELAY_REMOVE_DEAD_NEIGHBOR       =320000, //32000=1s
+   DELAY_REMOVE_DEAD_NEIGHBOR       =960000, //32000=1s
    //state
    QUEUELENGTH = 5,

apps/TSCH/TSCHP.nc

@@ -47 +47 @@
 
    task void taskAddReservation() {
-      call ReservationUpdate.addSlot(1);
+      if ((call IDManager.getMyID())==1) {
+         call ReservationUpdate.addSlot(3);
+      } else {
+         call ReservationUpdate.addSlot(1);
+      }
+
    }
 
@@ -57 +62 @@
          if (queuedPktUsed[i]==FALSE) {
             queuedPktUsed[i]=TRUE;
-            ((cc2420_header_t*)queuedPkt[i].header)->dest=1;
+            if ((call IDManager.getMyID())==1) {
+               ((cc2420_header_t*)queuedPkt[i].header)->dest=3;
+            } else {
+               ((cc2420_header_t*)queuedPkt[i].header)->dest=1;
+            }
             ((data_format_t*)queuedPkt[i].data)->payload[0]=datavaluecounter;
             sendError = call Send.send(&queuedPkt[i],sizeof(data_format_t));
@@ -139 +148 @@
          case 4: call PrintSerialIO.print();    break;
          case 5: call PrintTSCHQueue.print();   break;
-         //case ?: call PrintGlobalTime.print();  break;
-         //case ?: call PrintForwarding.print();  break;
-         //case ?: call PrintSlotEngine.print();  break;
+                 //case ?: call PrintGlobalTime.print();  break;
+                 //case ?: call PrintForwarding.print();  break;
+                 //case ?: call PrintSlotEngine.print();  break;
          default: debugPrintCounter=0;
       }

apps/TSCH/advertise/AdvertiseP.nc

@@ -38 +38 @@
       //fill data slotOffset and channelOffset
       slotChannelRES = (call CellUsageGet.getCell(CELLTYPE_RES,(call IDManager.getMyID())));
-      if(slotChannelRES.exists==TRUE){
+      if (slotChannelRES.exists==TRUE) {
          ((adv_format_t*)pkt.data)->channelOffset=slotChannelRES.channelOffset;
       } else {
@@ -62 +62 @@
       ((cc2420_header_t*)pkt.header)->type=AM_TSCH_ADV;
       //send
-      if ((call SimpleSend.send(&pkt))==FAIL){//if radio has problems sending
+      if ((call SimpleSend.send(&pkt))==FAIL) {//if radio has problems sending
          atomic busy=FALSE;
       }
       //set a new random advPeriod
       if (call NeighborGet.getNumNeighbors()>1) {
-         //advPeriod = SLOT_TIME*LENGTHCELLFRAME*(call NeighborGet.getNumNeighbors());//poipoi
+         advPeriod = (SLOT_TIME/32)*LENGTHCELLFRAME*(call NeighborGet.getNumNeighbors());
       }
       call Timer.stop();

apps/TSCH/deploy.sh

@@ -1 +1 @@
 #!/bin/bash
 make telosb install.1  bsl,20
-#make telosb install.2  bsl,21
+make telosb install.2  bsl,21
 make telosb install.3  bsl,22
 

apps/TSCH/neighbors/NeighborsP.nc

@@ -51 +51 @@
       uint8_t i;
       for (i=0;i<MAXNUMNEIGHBORS;i++){
-            if (neighbors[i].used==TRUE) {
-               actualTimeSinceLastHeard  = (call GlobalTime.getLocalTime())-neighbors[i].lastHeardTimestamp;
-               if (actualTimeSinceLastHeard>allowedTimeSinceLastHeard) {
-                  deadNeighbor = neighbors[i].id;
-                  removeNeighbor(deadNeighbor);
-                  call CellUsageSet.removeAllCellsToNeighbor(deadNeighbor);
-                  call DeQueue.removeAllPacketsToNeighbor(deadNeighbor);
-                  call ReservationUpdate.removeAllOngoingResToNeighbor(deadNeighbor);
-                  call SerialIO.printError(COMPONENT_NEIGHBORS,ERR_REMOVE_NEIGHBOR,(uint16_t)deadNeighbor,0);
-               }
+         if (neighbors[i].used==TRUE) {
+            actualTimeSinceLastHeard  = (call GlobalTime.getLocalTime())-neighbors[i].lastHeardTimestamp;
+            if (actualTimeSinceLastHeard>allowedTimeSinceLastHeard) {
+               deadNeighbor = neighbors[i].id;
+               removeNeighbor(deadNeighbor);
+               call CellUsageSet.removeAllCellsToNeighbor(deadNeighbor);
+               call DeQueue.removeAllPacketsToNeighbor(deadNeighbor);
+               call ReservationUpdate.removeAllOngoingResToNeighbor(deadNeighbor);
+               call SerialIO.printError(COMPONENT_NEIGHBORS,ERR_REMOVE_NEIGHBOR,(uint16_t)deadNeighbor,0);
+            }
          }
       }
@@ -242 +242 @@
          }
       } else {                                                       //neighbor known
-         //check that there is at least one TXDATA to that neighbor (for KA and connectivity) poipoi
-         /*if ((call CellUsageGet.getCell(CELLTYPE_TXDATA,((cc2420_header_t*)msg->header)->src)).exists==FALSE) {
-           if ((call ReservationUpdate.addSlot(((cc2420_header_t*)msg->header)->src))==FAIL) {
-           call SerialIO.printError(COMPONENT_NEIGHBORS,ERR_TXDATA_RESERVATION_TO_NEIGHBOR_FAILED,(uint16_t)((cc2420_header_t*)msg->header)->src,0);
-           }
-           }*/
+         //check that there is at least one TXDATA to that neighbor (for KA and connectivity)
+         if ((call CellUsageGet.getCell(CELLTYPE_TXDATA,((cc2420_header_t*)msg->header)->src)).exists==FALSE) {
+            if ((call ReservationUpdate.addSlot(((cc2420_header_t*)msg->header)->src))==FAIL) {
+               call SerialIO.printError(COMPONENT_NEIGHBORS,ERR_TXDATA_RESERVATION_TO_NEIGHBOR_FAILED,(uint16_t)((cc2420_header_t*)msg->header)->src,0);
+            }
+         }
       }
       i=0; //update DAGrank

apps/TSCH/reservation/ReservationP.nc

@@ -165 +165 @@
                }
                ongoingRes[i].todo = INFORM_REQUESTER;
-            }*/
+            }*///poipoi
             break;
          default:
@@ -172 +172 @@
       }
       //any other ongoingRes I need to serve?
+      i=0;
       while(i<NUMONGOINGRES) {
          if(ongoingRes[i].todo!=UNUSED && ongoingRes[i].todo!=WAIT_FOR_SENT && ongoingRes[i].todo!=WAIT_FOR_RESPONSE) {
@@ -330 +331 @@
    event void SimpleSend.sendDone(message_t *msg, error_t error) {
       uint8_t i=0;
-      call SerialIO.printError(COMPONENT_RESERVATION,ERR_RES_SENT,(uint16_t)ongoingRes[i].slotOffset,(uint16_t)((cc2420_metadata_t*)msg->metadata)->ack);
       //which ongoing reservation is this for?
       while(i<NUMONGOINGRES) {
@@ -346 +346 @@
          return;
       }
+      call SerialIO.printError(COMPONENT_RESERVATION,ERR_RES_SENT,(uint16_t)ongoingRes[i].slotOffset,(uint16_t)((cc2420_metadata_t*)msg->metadata)->ack);
       if (ongoingRes[i].localRequester==LOCAL) {//I sent a request
          ongoingRes[i].retries++;