Better management of frame counter and stats in PDCP

openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c

@@ -21,7 +21,7 @@
 
 /*! \file flexran_agent_pdcp.c
  * \brief FlexRAN agent Control Module PDCP 
- * \author shahab SHARIAT BAGHERI
+ * \author Navid Nikaein and shahab SHARIAT BAGHERI
  * \date 2017
  * \version 0.1
  */
@@ -118,6 +118,9 @@ int flexran_agent_pdcp_stats_reply(mid_t mod_id,
 	pdcp_aggr_stats->pkt_rx_sn = flexran_get_pdcp_rx_sn(mod_id, i, DEFAULT_DRB);
 	pdcp_aggr_stats->has_pkt_rx_sn =1;
 
+	pdcp_aggr_stats->sfn = flexran_get_pdcp_sfn(mod_id);
+	pdcp_aggr_stats->has_sfn =1;
+
 	ue_report[i]->pdcp_stats = pdcp_aggr_stats;
 
       }

openair2/ENB_APP/MESSAGES/V2/stats_common.proto

@@ -266,4 +266,6 @@ message flex_pdcp_stats {
 	optional uint32 pkt_rx_aiat = 14;
 	optional uint32 pkt_rx_aiat_s = 15;
 	optional uint32 pkt_rx_oo = 16;
+
+	optional uint64 sfn=17;
 }

openair2/ENB_APP/flexran_agent_ran_api.c

@@ -1083,6 +1083,10 @@ void flexran_agent_set_operating_frame_type (mid_t mod_id, int cc_id, int frame_
 }
 
 /*********** PDCP  *************/
+/*PDCP num tx pdu status flexRAN*/
+uint32_t flexran_get_pdcp_sfn(const mid_t mod_id){
+  return Pdcp_sfn[mod_id];
+}
 
 /*PDCP num tx pdu status flexRAN*/
 uint32_t flexran_get_pdcp_tx(const mid_t mod_id,  const mid_t ue_id, const lcid_t lcid){

openair2/ENB_APP/flexran_agent_ran_api.h

@@ -342,6 +342,9 @@ int flexran_get_rrc_status(const mid_t mod_id,  const rnti_t  rntiP);
 
 /***************************** PDCP ***********************/
 
+/*PDCP superframe numberflexRAN*/
+uint32_t flexran_get_pdcp_sfn(const mid_t mod_id);
+
 /*PDCP num tx pdu status flexRAN*/
 uint32_t flexran_get_pdcp_tx(const mid_t mod_id,  const mid_t ue_id, const lcid_t lcid);
 

openair2/LAYER2/PDCP_v10.1.0/pdcp.h

@@ -94,9 +94,10 @@ extern int             pdcp_instance_cnt;
 int init_pdcp_thread(void);
 void cleanup_pdcp_thread(void);
 
-public_pdcp(frame_t pdcp_frame);
-public_pdcp(sub_frame_t pdcp_subframe);
-public_pdcp(uint16_t pdcp_num_ues);
+public_pdcp(uint64_t Pdcp_sfn[MAX_NUM_CCs]);
+public_pdcp(frame_t Pdcp_frame[MAX_NUM_CCs]);
+public_pdcp(sub_frame_t Pdcp_subframe[MAX_NUM_CCs]);
+public_pdcp(uint16_t Pdcp_num_ues[MAX_NUM_CCs]);
 
 
 public_pdcp(uint32_t Pdcp_stats_tx_bytes[MAX_NUM_CCs][NUMBER_OF_UE_MAX][NB_RB_MAX]);