Restart or remove transmission when MAC data request timeouts (ARMmbed#2636)

* Data request timeout to 10s. Adapt layer will remove or resend

* Updated unit tests

* Removed debug traces

* Do not timeout broadcast frames

Author: Jarkko Paso

source/6LoWPAN/adaptation_interface.c

@@ -1631,6 +1631,11 @@ int8_t lowpan_adaptation_interface_tx_confirm(protocol_interface_info_entry_t *c
         }
     } else if ((confirm->status == MLME_BUSY_CHAN) && !ws_info(cur)) {
         lowpan_data_request_to_mac(cur, buf, tx_ptr, interface_ptr);
+    } else if ((buf->link_specific.ieee802_15_4.requestAck) && (confirm->status == MLME_TRANSACTION_EXPIRED)) {
+        lowpan_adaptation_tx_queue_write_to_front(cur, interface_ptr, buf);
+        ns_list_remove(&interface_ptr->activeUnicastList, tx_ptr);
+        ns_dyn_mem_free(tx_ptr);
+        interface_ptr->activeTxList_size--;
     } else {
 
 

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -57,8 +57,7 @@
 // Used to set TX time (us) with FHSS. Must be <= 65ms.
 #define MAC_TX_PROCESSING_DELAY_INITIAL 2000
 // Give up on data request after given timeout (seconds)
-#define DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S  30
-#define DATA_REQUEST_TIMEOUT_EF_PRIORITY_S      120
+#define DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S  10
 
 typedef struct {
     uint8_t address[8];
@@ -1109,9 +1108,8 @@ static bool mcps_sap_check_buffer_timeout(protocol_interface_rf_mac_setup_s *rf_
 {
     // Convert from 1us slots to seconds
     uint32_t buffer_age_s = (mac_mcps_sap_get_phy_timestamp(rf_mac_setup) - buffer->request_start_time_us) / 1000000;
-    if ((buffer->priority == MAC_PD_DATA_NORMAL_PRIORITY) && (buffer_age_s > DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S)) {
-        return true;
-    } else if ((buffer->priority == MAC_PD_DATA_EF_PRIORITY) && (buffer_age_s > DATA_REQUEST_TIMEOUT_EF_PRIORITY_S)) {
+    // Do not timeout broadcast frames. Broadcast interval could be very long.
+    if (buffer->fcf_dsn.ackRequested && (buffer_age_s > DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S)) {
         return true;
     }
     return false;

test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c

@@ -62,6 +62,7 @@
 #include <string.h>
 
 static uint8_t tes_mac_mcps_mac64[8];
+uint32_t test_timestamp = 1000000;
 
 static mac_pre_build_frame_t *tes_mac_mcps_temporary_buffer_get(uint16_t length)
 {
@@ -74,6 +75,8 @@ static mac_pre_build_frame_t *tes_mac_mcps_temporary_buffer_get(uint16_t length)
         buf->mac_allocated_payload_ptr = true;
         buf->mac_payload_length = length;
     }
+    buf->request_start_time_us = test_timestamp - 100000;
+    buf->fcf_dsn.ackRequested = true;
 
     return buf;
 }
@@ -238,7 +241,6 @@ static  arm_device_driver_list_s *rf_client_driver_allocate()
     return driver;
 }
 
-uint32_t test_timestamp = 1000000;
 static int8_t test_rf_extension(phy_extension_type_e extension, uint8_t *buf)
 {
     switch (extension) {
@@ -3054,10 +3056,10 @@ bool test_mac_mcps_trig_buffer_from_queue()
     buf2 = tes_mac_mcps_temporary_buffer_get(0);
     mac_pre_build_frame_t *buf3 = tes_mac_mcps_temporary_buffer_get(0);
     mac_pre_build_frame_t *buf4 = tes_mac_mcps_temporary_buffer_get(0);
-    buf->request_start_time_us = test_timestamp - 32000000;
-    buf2->request_start_time_us = test_timestamp - 31000000;
-    buf3->request_start_time_us = test_timestamp - 25000000;
-    buf4->request_start_time_us = test_timestamp - 23000000;
+    buf->request_start_time_us = test_timestamp - 12000000;
+    buf2->request_start_time_us = test_timestamp - 11000000;
+    buf3->request_start_time_us = test_timestamp - 5000000;
+    buf4->request_start_time_us = test_timestamp - 3000000;
     rf_mac_setup->pd_data_request_queue_to_go = buf;
     rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
     rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
@@ -3074,65 +3076,6 @@ bool test_mac_mcps_trig_buffer_from_queue()
     }
     mac_mcps_buffer_queue_free(rf_mac_setup);
 
-    // Test removing old buffers with low priority from queue
-    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
-    // Add 4 buffers in queue, buf and buf2 are too old but only first one should be removed
-    buf = tes_mac_mcps_temporary_buffer_get(0);
-    buf2 = tes_mac_mcps_temporary_buffer_get(0);
-    buf3 = tes_mac_mcps_temporary_buffer_get(0);
-    buf4 = tes_mac_mcps_temporary_buffer_get(0);
-    buf->request_start_time_us = test_timestamp - 32000000;
-    buf2->request_start_time_us = test_timestamp - 31000000;
-    buf3->request_start_time_us = test_timestamp - 25000000;
-    buf4->request_start_time_us = test_timestamp - 23000000;
-    // Change buf2 priority to medium
-    buf2->priority = MAC_PD_DATA_MEDIUM_PRIORITY;
-    rf_mac_setup->pd_data_request_queue_to_go = buf;
-    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
-    rf_mac_setup->unicast_queue_size = 4;
-    fhss_config_stub.bool_value = false;
-    fhss_tx_condition = true;
-    // Trig should remove first buffer and take second as active data request
-    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
-    if (rf_mac_setup->active_pd_data_request != buf2) {
-        test_mac_rf_mac_class_free(rf_mac_setup);
-        printf("Fail: Remove old buffers with priority, wrong buffer activated\r\n");
-        return false;
-    }
-    mac_mcps_buffer_queue_free(rf_mac_setup);
-
-    // Test removing old buffers with EF priority from queue
-    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
-    // Add 4 buffers in queue, buf(normal priority) and buf2(EF priority) are too old and should be removed
-    buf = tes_mac_mcps_temporary_buffer_get(0);
-    buf2 = tes_mac_mcps_temporary_buffer_get(0);
-    buf3 = tes_mac_mcps_temporary_buffer_get(0);
-    buf4 = tes_mac_mcps_temporary_buffer_get(0);
-    buf->request_start_time_us = test_timestamp - 32000000;
-    buf2->request_start_time_us = test_timestamp - 121000000;
-    buf3->request_start_time_us = test_timestamp - 100000000;
-    buf4->request_start_time_us = test_timestamp - 23000000;
-    // Change buf2 and buf3 priority to expedited forwarding
-    buf2->priority = MAC_PD_DATA_EF_PRIORITY;
-    buf3->priority = MAC_PD_DATA_EF_PRIORITY;
-    rf_mac_setup->pd_data_request_queue_to_go = buf;
-    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
-    rf_mac_setup->unicast_queue_size = 4;
-    fhss_config_stub.bool_value = false;
-    fhss_tx_condition = true;
-    // Trig should remove first two buffers and take third as active data request
-    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
-    if (rf_mac_setup->active_pd_data_request != buf3) {
-        test_mac_rf_mac_class_free(rf_mac_setup);
-        printf("Fail: Remove old buffers with EF priority, wrong buffer activated\r\n");
-        return false;
-    }
-    mac_mcps_buffer_queue_free(rf_mac_setup);
-
     // Free test setup struct
     test_mac_rf_mac_class_free(rf_mac_setup);
     return true;