Add Total Uplink TBS to eNB_UE_stats

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c

@@ -549,9 +549,9 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                             monapp->has_total_tbs_dl = 1;
 
                             monapp->total_tbs_ul = flexran_get_total_TBS_ul(mod_id, i, cc_id);
-                            monapp->has_total_tbs_dl = 1;
-
-                            Protocol__FlexMacSdusDl ** mac_sdus;
+                            monapp->has_total_tbs_ul = 1;
+                           
+                            Protocol__FlexMacSdusDl ** mac_sdus;           
                             mac_sdus = malloc(sizeof(Protocol__FlexMacSdusDl) * flexran_get_num_mac_sdu_tx(mod_id, i, cc_id));
                             if (mac_sdus == NULL)
                                 goto error;

openair2/ENB_APP/flexran_agent_ran_api.c

@@ -325,7 +325,7 @@ uint64_t flexran_get_total_TBS_dl(mid_t mod_id, mid_t ue_id, int cc_id){
 uint64_t flexran_get_total_TBS_ul(mid_t mod_id, mid_t ue_id, int cc_id){
 
   if (!mac_is_present(mod_id)) return 0;
-  return /*TODO for uplink*/0;//UE_list->eNB_UE_stats[CC_id][UE_id].total_pdu_bytes;
+  return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_ulsch_TBS;
 }
 
 uint8_t flexran_get_mcs1_dl(mid_t mod_id, mid_t ue_id, int cc_id){

openair2/LAYER2/MAC/defs.h

@@ -615,6 +615,8 @@ typedef struct {
     ///  uplink transport block size
     uint32_t ulsch_TBS;
 
+    uint32_t total_ulsch_TBS;
+
     ///  total rb used for a new uplink transmission
     uint32_t num_retransmission_rx;
     ///  total rb used for a new uplink transmission

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -1315,6 +1315,7 @@ schedule_ulsch_rnti(module_id_t module_idP,
 						       rb_table[rb_table_index]);
 	    UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_rx += rb_table[rb_table_index];
 	    UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_TBS = UE_template->TBS_UL[harq_pid];
+            UE_list->eNB_UE_stats[CC_id][UE_id].total_ulsch_TBS += UE_template->TBS_UL[harq_pid];
 	    //            buffer_occupancy -= TBS;
 
 	    T(T_ENB_MAC_UE_UL_SCHEDULE, T_INT(module_idP),