Changeset 1067

Timestamp:

02/25/2010 05:04:54 PM (7 months ago)

Author:

jcy

Message:

Test updates.
Implementation of sleep-opt in tdma-asap.
Fixed bug in tdma-asap where sync packets were reported to application.

Location:

nano-RK

Files:

• projects/tests/test_bmac/main.c (modified) (9 diffs)
• projects/tests/test_tdma/main.c (modified) (3 diffs)
• src/net/tdma_asap/tdma_asap.c (modified) (15 diffs)
• src/net/tdma_asap/tdma_asap.h (modified) (1 diff)
• src/net/tdma_asap/tdma_asap_stats.c (modified) (4 diffs)
• src/net/tdma_asap/tdma_asap_stats.h (modified) (1 diff)
• src/net/tdma_asap/tdma_asap_tree.h (modified) (1 diff)

nano-RK/projects/tests/test_bmac/main.c

@@ -39 +39 @@
 #define BMAC_SINK 2
 
+
+#define DBG_PKT_ORDER
+
+// max number of retries before giving up packet send
+#define BMAC_UNLIMITED_RETRY
+
+#ifndef BMAC_UNLIMITED_RETRY
+    #define MAX_RETRIES 5
+#endif
+
+
 // for compatibility
 #define BMAC_DATA_START 0
 #define STATS_STACK 512
 
-#define NODE_MODE BMAC_SOURCE
-
-#define EVENT_PERIOD_SECS 0
-#define EVENT_PERIOD_NANOS 500000000
+#define NODE_MODE BMAC_SINK
+
+#define EVENT_PERIOD_SECS 1
+#define EVENT_PERIOD_NANOS 0
 #define EVENT_PERIOD_MULT 1
 
@@ -100 +111 @@
 uint8_t have_data_to_send;
 uint16_t pkt_num;
+
+uint16_t pkt_nbr_expect;
+uint16_t errs;
 
 
@@ -291 +305 @@
 int8_t rte_event(uint8_t * ev_buf)
 {
+    uint16_t pkt_nbr;
+
+    pkt_nbr = ev_buf[BMAC_DATA_START+2];
+    pkt_nbr <<= 8;
+    pkt_nbr |= ev_buf[BMAC_DATA_START+3];
+
+    printf("PKTGET %d %d %d\r\n", 
+        ev_buf[BMAC_DATA_START+1],
+        pkt_nbr,
+        my_addr8);
+
     ev_queue[end].sender = ev_buf[BMAC_DATA_START+4];
     ev_queue[end].seq  =   ev_buf[BMAC_DATA_START+5]<<8;
@@ -320 +345 @@
     pkt_nbr <<= 8;
     pkt_nbr |= ev_buf[BMAC_DATA_START+3];
+
+#ifdef DBG_PKT_ORDER
+    // XXX REMEMBER TO TAKE THIS OUT
+    if (pkt_nbr > pkt_nbr_expect)
+        printf("WRONGPKT %d\r\n", errs++);
+        
+    pkt_nbr_expect = pkt_nbr+1;
+#endif
 
     printf("PKTGET %d %d %d\r\n", 
@@ -693 +726 @@
     while (!bmac_started())
         nrk_wait(delay_time);
+
     printf("bmac init done\r\n");
 
@@ -766 +800 @@
 { 
 
+    uint8_t retries;
+
     printf("txTask %d\r\n", nrk_get_pid());
     have_data_to_send = 0;
@@ -807 +843 @@
 
             //while (bmac_tx_pkt(test_tx_buf[(current_buf+1)%2], test_tx_offset[(current_buf+1)%2])==NRK_ERROR);
-            while (bmac_tx_pkt(pkt_tx_buf, EVPKT_SIZE)==NRK_ERROR);
+
+            retries = 0;
+
+            #ifdef BMAC_UNLIMITED_RETRY
+                while (bmac_tx_pkt(pkt_tx_buf, EVPKT_SIZE)==NRK_ERROR);
+            #else
+                while (bmac_tx_pkt(pkt_tx_buf, EVPKT_SIZE)==NRK_ERROR && retries++ < MAX_RETRIES);
+            #endif
+
         
         nrk_led_clr(RED_LED);
@@ -819 +863 @@
         //printf("PKTSEND %u %u %u %u %20"PRIu32" %20"PRIu32"\r\n", my_addr8, pkt_num-1, my_level, tdma_tree_parent_get(), current_time.secs, current_time.nano_secs);
         //printf("PKTSEND %u %u %u %u %20"PRIu32" %20"PRIu32"\r\n", my_addr8, pkt_num-1, my_level, my_parent, current_time.secs, current_time.nano_secs);
+        
+#ifndef BMAC_UNLIMITED_RETRY
+        if (retries < MAX_RETRIES)
+            printf("PKTSEND %u %u %u %u\r\n", my_addr8, pkt_num-1, my_level, my_parent);
+        else
+            printf("GU %u %u\r\n", my_addr8, pkt_num-1);
+#else
+        // always sent
         printf("PKTSEND %u %u %u %u\r\n", my_addr8, pkt_num-1, my_level, my_parent);
+#endif
 
     }
@@ -886 +939 @@
                 }
             }
+            else
+                nrk_kprintf(PSTR("wrong CTL\r\n"));
         }
         else

nano-RK/projects/tests/test_tdma/main.c

@@ -42 +42 @@
 // Only require MAC address for address decode 
 #define MAC_ADDR    0x0001
-#define EVENT_PERIOD_SECS 0
-#define EVENT_PERIOD_NANOS 500000000
-#define EVENT_PERIOD_MULT 1
+#define EVENT_PERIOD_SECS 1
+#define EVENT_PERIOD_NANOS 0
+#define EVENT_PERIOD_MULT 5
 
 #define TDMA_MODE TDMA_SLAVE
@@ -165 +165 @@
 int8_t rte_event(uint8_t * ev_buf)
 {
+    uint16_t pkt_nbr;
+
+    pkt_nbr = ev_buf[TDMA_DATA_START+2];
+    pkt_nbr <<= 8;
+    pkt_nbr |= ev_buf[TDMA_DATA_START+3];
+
+    printf("PKTGET %d %d %d\r\n", 
+        ev_buf[TDMA_DATA_START+1],
+        pkt_nbr,
+        my_addr8);
+
     ev_queue[end].sender = ev_buf[TDMA_DATA_START+4];
     ev_queue[end].seq  =   ev_buf[TDMA_DATA_START+5]<<8;
@@ -723 +734 @@
                 }
             }
+
             local_rx_buf[TDMA_DATA_START] = 1;
             tdma_rx_pkt_release();

nano-RK/src/net/tdma_asap/tdma_asap.c

@@ -130 +130 @@
 #endif 
 
+#ifdef TDMA_SLEEP_OPT
+    // acts as both a control value and a slot value
+    // if 0xFFFF, then sleep opt is not active
+    // otherwise will hold the slot that the feature was
+    // activated for this cycle
+    uint16_t tdma_sleep_opt_slot;
+#endif
+
 uint8_t tdma_init_done = 0;
 uint8_t tdma_running=0;
@@ -137 +145 @@
 
 uint16_t minipkt_id = 0;
-
-// for autoack
-static uint8_t pkt_got_ack = 0;
-
 
 uint8_t tdma_channel   = TDMA_DEFAULT_CHANNEL;
@@ -482 +486 @@
     }
 
+    // make sure sleeping til end of slot is disabled
+    #ifdef TDMA_SLEEP_OPT
+    tdma_sleep_opt_slot = 0xFFFF;
+    #endif
+
     tdma_init_done = 1;
     return NRK_OK;
@@ -793 +802 @@
             #ifdef TDMA_TEXT_DEBUG_ALL
                 nrk_kprintf(PSTR("No sender heard\r\n"));
+            #endif
+
+            // If we're using the sleep opt feature, record this slot as
+            // the one in the cycle we didn't receive anything from children
+            // and thus we'll sleep for the rest of the RX from child slots
+            // in this cycle
+            #ifdef TDMA_SLEEP_OPT
+                tdma_sleep_opt_slot = next_schedule_entry.slot;
             #endif
 
@@ -1063 +1080 @@
         // if it's newer, sync to it.
         // token loops around, so allow some slack
-        if (tdma_node_mode != TDMA_MASTER && (tmp_token > tdma_time_token || 
-                    (tdma_time_token > 110 && tmp_token < 10 )))
+        if (tdma_node_mode != TDMA_MASTER && ((tmp_token > tdma_time_token) || 
+                    (tdma_time_token > 110 && tmp_token < 40 )))
         {   
             
@@ -1157 +1174 @@
         else
         { 
+#ifdef TDMA_STATS_COLLECT
+            // If I was supposed to get a sync packet on this slot, and did, record it
+            if (next_schedule_entry.priority == 1)
+                sync_rx_cnt++;
+#endif
             // If it is an explicit time sync packet, then release it
             // so it doesn't block a buffer...
@@ -1213 +1235 @@
 
     // This clears the explicit sync bit
-    tdma_rfTxInfo.pPayload[TDMA_TIME_TOKEN]= -1; 
+    tdma_rfTxInfo.pPayload[TDMA_TIME_TOKEN]= tdma_time_token; 
     explicit_tsync=0;
 
     // If it is an empty packet set explicit sync bit
-    if(tdma_rfTxInfo.length==TDMA_DATA_START )
+    //if(tdma_rfTxInfo.length==TDMA_DATA_START )
+    
+    if (next_schedule_entry.type == TDMA_TX_CHILD)
     {
         explicit_tsync=1;
@@ -1654 +1678 @@
 
     // This clears the explicit sync bit
-    tdma_rfTxInfo.pPayload[TDMA_TIME_TOKEN]= tdma_time_token; 
+    // don't uncomment this.  It will mess up the sync packet stuff.
+    //tdma_rfTxInfo.pPayload[TDMA_TIME_TOKEN]= tdma_time_token; 
 
 
@@ -1676 +1701 @@
 #endif
     rf_rx_off();
-
-    //if (!pkt_got_ack)
-    //    printf("af %u\r\n", tdma_rfTxInfo.destAddr);
-
-    // restore dest addr at end
-    //if (explicit_tsync)
-    //    tdma_rfTxInfo.destAddr = dest_tmp;
 
 #ifdef TDMA_STATS_COLLECT
@@ -2013 +2031 @@
                 if (sync_slot < 0 || sync_slot > TDMA_SLOTS_PER_CYCLE)
                 {
-                    printf("BAD SYNC %d\r\n", sync_slot);
+                    printf("BAD SYNC %u\r\n", sync_slot);
                     continue;
                 }
@@ -2020 +2038 @@
                 tmp_token = 0x7F & tdma_rfRxInfo.pPayload[TDMA_TIME_TOKEN];
 
-                if ((tmp_token <= tdma_time_token) && 
-                    !(tdma_time_token > 110 && tmp_token < 10 ))
+                if ((tmp_token <= tdma_time_token) &&
+                    !(tdma_time_token > 110 && tmp_token < 40 ))
                 {   
                     printf("bad token %d %d\r\n", tdma_time_token, tmp_token);
@@ -2123 +2141 @@
                 // sync time has expired.  Go into re-sync mode
                 in_sync = 0;
-                //tdma_time_token = 0;
+
+                // to prevent infinite syncing between 2 nodes that are not parent,
+                // increment the token count by 1
+                //tdma_time_token++;
+
+                //if (tdma_time_token > 126)
+                //    tdma_time_token = 0;
+
                 continue;
             }
@@ -2186 +2211 @@
         }
 
+        
+
 #ifdef GPIO_NEWTMR_SLT_DEBUG
         PORTA &= ~BM(GPIO_NEWTMR_SLT_DEBUG);
@@ -2243 +2270 @@
             _tdma_rx(next_schedule_entry.slot);
 
+#ifdef TDMA_STATS_COLLECT
+            if (next_schedule_entry.priority == 1)
+                sync_slot_cnt++;
+#endif
 /*
             if (tdma_rx_pkt_check() == 0)
@@ -2389 +2420 @@
 
         next_schedule_entry = tdma_schedule_get_next(next_schedule_entry.slot);
+
+        #ifdef TDMA_SLEEP_OPT
+            // if tdma_sleep_opt is enabled for this cycle, I have to search the schedule until
+            // a slot that is not a RX from child is found.
+            if (tdma_sleep_opt_slot != 0xFFFF)
+            {
+                // while an rx slot from child
+                while(next_schedule_entry.type == TDMA_RX
+                      && next_schedule_entry.priority != 1
+                      // and the slot is further along in the cycle
+                      && next_schedule_entry.slot > tdma_sleep_opt_slot)
+                {
+                    next_schedule_entry = tdma_schedule_get_next(next_schedule_entry.slot);
+                }
+            
+                if (next_schedule_entry.slot <= tdma_sleep_opt_slot)
+                    tdma_sleep_opt_slot = 0xFFFF;
+            }
+        #endif
+
     }
 }

nano-RK/src/net/tdma_asap/tdma_asap.h

@@ -108 +108 @@
 
 
+    // optimization added feb 15: if none of my children
+    // have to TX I will sleep for the rest of my RX slots from children in the cycle
+    // NOTE: this is implemented as still waking up but sleeping immediately again if
+    // I don't need to be awake
+//#define TDMA_SLEEP_OPT
 
 

nano-RK/src/net/tdma_asap/tdma_asap_stats.c

@@ -100 +100 @@
     dbl_pkt_cnt = 0;
     mpkt_log_curbuf=0;
+    sync_rx_cnt = 0;
+    sync_slot_cnt = 0;
     //recording_awk_reg = 0;
     //recording_awk_steal =0;
@@ -203 +205 @@
   // number of slot steals
   // number of backoffs
+  // number of rx syncs
+  // number of sync slots
 
 #ifdef NRK_STATS_TRACKER
@@ -211 +215 @@
 #endif
 
-  printf("SD %d %20"PRIu32" %20"PRIu32" %20"PRIu32" %20"PRIu32" %20"PRIu32"\r\n",
+  printf("SD %d %lu %lu %lu %lu %lu %u %u\r\n",
     tdma_mac_get(),
     tdma_cpu_time.secs,
@@ -217 +221 @@
     ticks_rdo,
     steal_cnt,
-    backoff_cnt);
+    backoff_cnt,
+    sync_rx_cnt,
+    sync_slot_cnt);
 
 }

nano-RK/src/net/tdma_asap/tdma_asap_stats.h

@@ -49 +49 @@
 uint32_t backoff_cnt;
 uint32_t dbl_pkt_cnt;
+// # sync packets rcvd (100% if equal to sync_slot_cnt)
+uint16_t sync_rx_cnt;
+// # of sync slots
+uint16_t sync_slot_cnt;
 
 /*

nano-RK/src/net/tdma_asap/tdma_asap_tree.h

@@ -25 +25 @@
 
 // use a static schedule as computed by a slot spreading algorithm
-//#define TDMA_SLOT_SPREADING
+#define TDMA_SLOT_SPREADING
 
 // # of nodes max using TDMA