Added adaptation layer TX queue size statistic

Author: Jarkko Paso

nanostack/nwk_stats_api.h

@@ -70,7 +70,9 @@ typedef struct nwk_stats_t {
     /* ETX */
     uint16_t etx_1st_parent;        /**< Primary parent ETX. */
     uint16_t etx_2nd_parent;        /**< Secondary parent ETX. */
-
+    /* MAC */
+    uint16_t adapt_layer_tx_queue_size; /**< Adaptation layer direct TX queue size. */
+    uint16_t adapt_layer_tx_queue_peak; /**< Adaptation layer direct TX queue size peak. */
 } nwk_stats_t;
 
 /**

source/6LoWPAN/adaptation_interface.c

@@ -92,6 +92,7 @@ typedef struct {
     fragmenter_tx_entry_t active_unicast_tx_buf; //Current active direct unicast tx process
     fragmenter_tx_entry_t active_broadcast_tx_buf; //Current active direct broadcast tx process
     buffer_list_t directTxQueue; //Waiting free tx process
+    uint16_t directTxQueue_size;
     uint16_t indirect_big_packet_threshold;
     uint16_t max_indirect_big_packets_total;
     uint16_t max_indirect_small_packets_per_child;
@@ -216,6 +217,8 @@ static void lowpan_adaptation_tx_queue_write(fragmenter_interface_t *interface_p
     } else {
         ns_list_add_to_end(&interface_ptr->directTxQueue, buf);
     }
+    interface_ptr->directTxQueue_size++;
+    protocol_stats_update(STATS_AL_TX_QUEUE_SIZE, interface_ptr->directTxQueue_size);
 }
 
 static buffer_t *lowpan_adaptation_tx_queue_read(fragmenter_interface_t *interface_ptr, protocol_interface_info_entry_t *cur)
@@ -231,6 +234,8 @@ static buffer_t *lowpan_adaptation_tx_queue_read(fragmenter_interface_t *interfa
         } else if ((buf->link_specific.ieee802_15_4.requestAck && !interface_ptr->active_unicast_tx_buf.buf)
                    || (!buf->link_specific.ieee802_15_4.requestAck && !interface_ptr->active_broadcast_tx_buf.buf)) {
             ns_list_remove(&interface_ptr->directTxQueue, buf);
+            interface_ptr->directTxQueue_size--;
+            protocol_stats_update(STATS_AL_TX_QUEUE_SIZE, interface_ptr->directTxQueue_size);
             return buf;
         }
     }

source/NWK_INTERFACE/Include/protocol_stats.h

@@ -44,6 +44,7 @@ typedef enum {
     STATS_BUFFER_HEADROOM_FAIL,
     STATS_ETX_1ST_PARENT,
     STATS_ETX_2ND_PARENT,
+    STATS_AL_TX_QUEUE_SIZE
 
 } nwk_stats_type_t;
 

source/NWK_INTERFACE/protocol_stats.c

@@ -146,6 +146,12 @@ void protocol_stats_update(nwk_stats_type_t type, uint16_t update_val)
             case STATS_ETX_2ND_PARENT:
                 nwk_stats_ptr->etx_2nd_parent = update_val;
                 break;
+            case STATS_AL_TX_QUEUE_SIZE:
+                nwk_stats_ptr->adapt_layer_tx_queue_size = update_val;
+                if (nwk_stats_ptr->adapt_layer_tx_queue_size > nwk_stats_ptr->adapt_layer_tx_queue_peak) {
+                    nwk_stats_ptr->adapt_layer_tx_queue_peak = nwk_stats_ptr->adapt_layer_tx_queue_size;
+                }
+                break;
         }
     }
 }