Merge remote-tracking branch 'origin/393-dlsch-scheduler-optimization' into...

Merge remote-tracking branch 'origin/393-dlsch-scheduler-optimization' into develop_integration_2019_w08

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

@@ -295,7 +295,8 @@ void dlsch_scheduler_pre_ue_select_fairRR(
                             CC_id,
                             UE_id,
                             subframeP,
-                            S_DL_NONE);
+                            S_DL_NONE,
+                            rnti);
           end_flag[CC_id] = 1;
           break;
         }
@@ -418,7 +419,8 @@ void dlsch_scheduler_pre_ue_select_fairRR(
                             CC_id,
                             UE_id,
                             subframeP,
-                            S_DL_NONE);
+                            S_DL_NONE,
+                            rnti);
           end_flag[CC_id] = 1;
           break;
         }
@@ -541,7 +543,8 @@ void dlsch_scheduler_pre_ue_select_fairRR(
                             CC_id,
                             UE_id,
                             subframeP,
-                            S_DL_NONE);
+                            S_DL_NONE,
+                            rnti);
           end_flag[CC_id] = 1;
           break;
         }
@@ -810,7 +813,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
   unsigned char ta_len = 0;
   unsigned char sdu_lcids[NB_RB_MAX], lcid, offset, num_sdus = 0;
   uint16_t nb_rb, nb_rb_temp, nb_available_rb;
-  uint16_t TBS, j, sdu_lengths[NB_RB_MAX], rnti, padding = 0, post_padding = 0;
+  uint16_t TBS, j, sdu_lengths[NB_RB_MAX], padding = 0, post_padding = 0;
+  rnti_t rnti = 0;
   unsigned char dlsch_buffer[MAX_DLSCH_PAYLOAD_BYTES];
   unsigned char round = 0;
   unsigned char harq_pid = 0;
@@ -1215,8 +1219,11 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
           }
 
           add_ue_dlsch_info(module_idP,
-                            CC_id, UE_id, subframeP,
-                            S_DL_SCHEDULED);
+                            CC_id, 
+                            UE_id, 
+                            subframeP,
+                            S_DL_SCHEDULED,
+                            rnti);
           //eNB_UE_stats->dlsch_trials[round]++;
           UE_list->eNB_UE_stats[CC_id][UE_id].
           num_retransmission += 1;
@@ -1678,10 +1685,10 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
 
           if (opt_enabled == 1) {
             trace_pdu(DIRECTION_DOWNLINK, (uint8_t *)UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0],
-                      TBS, module_idP, WS_RA_RNTI, UE_RNTI(module_idP,UE_id),
+                      TBS, module_idP, WS_RA_RNTI, UE_RNTI(module_idP, UE_id),
                       eNB->frame, eNB->subframe,0,0);
             LOG_D(OPT,"[eNB %d][DLSCH] CC_id %d Frame %d  rnti %x  with size %d\n",
-                  module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), TBS);
+                  module_idP, CC_id, frameP, UE_RNTI(module_idP, UE_id), TBS);
           }
 
           T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP), T_INT(subframeP),
@@ -1691,7 +1698,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
                             CC_id,
                             UE_id,
                             subframeP,
-                            S_DL_SCHEDULED);
+                            S_DL_SCHEDULED,
+                            rnti);
           // store stats
           eNB->eNB_stats[CC_id].dlsch_bytes_tx+=sdu_length_total;
           eNB->eNB_stats[CC_id].dlsch_pdus_tx+=1;

openair2/LAYER2/MAC/mac_proto.h

@@ -441,7 +441,7 @@ void init_ue_sched_info(void);
 void add_ue_ulsch_info(module_id_t module_idP, int CC_id, int UE_id,
 		       sub_frame_t subframe, UE_ULSCH_STATUS status);
 void add_ue_dlsch_info(module_id_t module_idP, int CC_id, int UE_id,
-		       sub_frame_t subframe, UE_DLSCH_STATUS status);
+		                   sub_frame_t subframe, UE_DLSCH_STATUS status, rnti_t rnti);
 int find_UE_id(module_id_t module_idP, rnti_t rnti);
 int find_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP);
 rnti_t UE_RNTI(module_id_t module_idP, int UE_id);
@@ -1209,7 +1209,6 @@ void fill_nfapi_dlsch_config(eNB_MAC_INST * eNB,
 void fill_nfapi_harq_information(module_id_t module_idP,
 				 int CC_idP,
 				 uint16_t rntiP,
-				 uint16_t absSFP,
 				 nfapi_ul_config_harq_information *
 				 harq_information, uint8_t cce_idxP);
 
@@ -1221,9 +1220,10 @@ void fill_nfapi_ulsch_harq_information(module_id_t module_idP,
 				       sub_frame_t subframeP);
 
 uint16_t fill_nfapi_uci_acknak(module_id_t module_idP,
-			       int CC_idP,
-			       uint16_t rntiP,
-			       uint16_t absSFP, uint8_t cce_idxP);
+							int CC_idP,
+							uint16_t rntiP,
+							uint16_t absSFP, 
+							uint8_t cce_idxP);
 
 void fill_nfapi_dl_dci_1A(nfapi_dl_config_request_pdu_t * dl_config_pdu,
 			  uint8_t aggregation_level,