commit before merge. minor changes for testing

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -393,7 +393,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   nr_schedule_ulsch(module_idP, frame, slot);
 
   // This schedules the DCI for Downlink and PDSCH
-  nr_schedule_ue_spec(module_idP, frame, slot);
+  start_meas(&gNB->schedule_dlsch);
+  nr_schedule_ue_spec(module_idP, frame, slot); 
+  stop_meas(&gNB->schedule_dlsch);
 
   nr_schedule_pucch(module_idP, frame, slot);
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -1218,6 +1218,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
       // const int lcid = DL_SCH_LCID_DTCH;
       const int lcid = sched_ctrl->lcid_to_schedule;
       int dlsch_total_bytes = 0;
+      start_meas(&gNB_mac->rlc_data_req);
       if (sched_ctrl->num_total_bytes > 0) {
         tbs_size_t len = 0;
         while (size > 3) {
@@ -1231,6 +1232,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
           /* limit requested number of bytes to what preprocessor specified, or
            * such that TBS is full */
           const rlc_buffer_occupancy_t ndata = min(sched_ctrl->rlc_status[lcid].bytes_in_buffer, size);
+
+
           len = mac_rlc_data_req(module_id,
                                  rnti,
                                  module_id,
@@ -1243,6 +1246,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
                                  0,
                                  0);
 
+
           LOG_D(NR_MAC,
                 "%4d.%2d RNTI %04x: %d bytes from %s %d (ndata %d, remaining size %d)\n",
                 frame,
@@ -1291,6 +1295,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
         buf += size;
         dlsch_total_bytes += size;
       }
+      stop_meas(&gNB_mac->rlc_data_req);
 
       // Add padding header and zero rest out if there is space left
       if (size > 0) {

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -128,6 +128,8 @@ void dump_mac_stats(gNB_MAC_INST *gNB, char *output, int strlen)
     }
   }
   print_meas(&gNB->eNB_scheduler, "DL & UL scheduling timing stats", NULL, NULL);
+  print_meas(&gNB->schedule_dlsch,"dlsch scheduler",NULL,NULL);
+  print_meas(&gNB->rlc_data_req, "rlc_data_req",NULL,NULL);
 }
 
 

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -736,6 +736,8 @@ typedef struct gNB_MAC_INST_s {
   time_stats_t schedule_dlsch_preprocessor;
   /// processing time of eNB DLSCH scheduler
   time_stats_t schedule_dlsch;  // include rlc_data_req + MAC header + preprocessor
+  /// processing time of rlc_data_req
+  time_stats_t rlc_data_req;
   /// processing time of eNB MCH scheduler
   time_stats_t schedule_mch;
   /// processing time of eNB ULSCH reception

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -266,13 +266,11 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
       dump_dl(sched_info);
 #endif
 
-      if (ifi->NR_Schedule_response) {
-        AssertFatal(ifi->NR_Schedule_response!=NULL,
-                    "nr_schedule_response is null (mod %d, cc %d)\n",
-                    module_id,
-                    CC_id);
-        ifi->NR_Schedule_response(sched_info);
-      }
+      AssertFatal(ifi->NR_Schedule_response!=NULL,
+                  "nr_schedule_response is null (mod %d, cc %d)\n",
+                  module_id,
+                  CC_id);
+      ifi->NR_Schedule_response(sched_info);
 
       LOG_D(PHY,"NR_Schedule_response: SFN_SF:%d%d dl_pdus:%d\n",
 	    sched_info->frame,

openair2/RRC/NR/rrc_gNB.c

@@ -800,7 +800,7 @@ rrc_gNB_generate_defaultRRCReconfiguration(
   DRB_config->pdcp_Config->moreThanOneRLC = NULL;
 
   DRB_config->pdcp_Config->t_Reordering = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
-  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
+  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
   DRB_config->pdcp_Config->ext1 = NULL;
 
   ASN_SEQUENCE_ADD(&(*DRB_configList)->list, DRB_config);