gNB_scheduler in testing not complete yet

openair2/COMMON/platform_constants.h

@@ -70,14 +70,19 @@
 #ifdef LARGE_SCALE
 #    define MAX_MOBILES_PER_ENB         128
 #    define MAX_MOBILES_PER_ENB_NB_IoT  128
+#    define MAX_MOBILES_PER_GNB         128
 #    define MAX_eNB                      2
+#    define MAX_gNB                      2
 #else
 #    define MAX_MOBILES_PER_ENB         16
 #    define MAX_MOBILES_PER_ENB_NB_IoT  16
+#    define MAX_MOBILES_PER_GNB         16
 #    define MAX_eNB                      2
+#    define MAX_gNB                      2
 #endif
 
 #define MAX_MANAGED_ENB_PER_MOBILE  2
+#define MAX_MANAGED_GNB_PER_MOBILE  2
 
 ///NB-IOT
 #define NB_RB_MAX_NB_IOT  (maxDRB_NB_r13 + 3) //MP: NB_IoT --> 2(DRB)+3(SRBs - 2 is not used) = 5

openair2/LAYER2/NR_MAC_gNB/mac.h

@@ -107,6 +107,11 @@ typedef struct gNB_MAC_INST_s {
   sub_frame_t                     subframe;  
   /// Pointer to IF module instance for PHY
   NR_IF_Module_t                  *if_inst;
+    /// Common cell resources
+  NR_COMMON_channels_t common_channels[NFAPI_CC_MAX];
+  /// current PDU index (BCH,DLSCH)
+  uint16_t pdu_index[NFAPI_CC_MAX];
+
   /// NFAPI Config Request Structure
   nfapi_nr_config_request_t       config[NFAPI_CC_MAX];
   /// NFAPI DL Config Request Structure
@@ -121,12 +126,30 @@ typedef struct gNB_MAC_INST_s {
   nfapi_hi_dci0_request_t HI_DCI0_req[NFAPI_CC_MAX];
   /// NFAPI DL PDU structure
   nfapi_tx_request_t TX_req[NFAPI_CC_MAX];
-  /// Common cell resources
-  NR_COMMON_channels_t common_channels[NFAPI_CC_MAX];
-  /// current PDU index (BCH,DLSCH)
-  uint16_t pdu_index[NFAPI_CC_MAX];
 
   UE_list_t UE_list;
+
+    // MAC function execution peformance profiler
+  /// processing time of eNB scheduler
+  time_stats_t eNB_scheduler;
+  /// processing time of eNB scheduler for SI
+  time_stats_t schedule_si;
+  /// processing time of eNB scheduler for Random access
+  time_stats_t schedule_ra;
+  /// processing time of eNB ULSCH scheduler
+  time_stats_t schedule_ulsch;
+  /// processing time of eNB DCI generation
+  time_stats_t fill_DLSCH_dci;
+  /// processing time of eNB MAC preprocessor
+  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 eNB MCH scheduler
+  time_stats_t schedule_mch;
+  /// processing time of eNB ULSCH reception
+  time_stats_t rx_ulsch_sdu;  // include rlc_data_ind
+  /// processing time of eNB PCH scheduler
+  time_stats_t schedule_pch;
 } gNB_MAC_INST;
 
 #endif /*__LAYER2_NR_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -19,4 +19,8 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
                            NR_ServingCellConfigCommon_t *servingcellconfigcommon
                            );
 
+void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, 
+                               frame_t frameP,
+                               sub_frame_t subframeP);
+
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/
\ No newline at end of file

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -2,6 +2,7 @@
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "openair1/PHY/phy_extern.h"
 #include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/MAC/mac_proto.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "common/ran_context.h"
 
@@ -284,7 +285,11 @@ void NR_UL_indication(NR_UL_IND_t *UL_info)
       eNB_dlsch_ulsch_scheduler(module_id,
           (UL_info->frame+((UL_info->subframe>(9-sf_ahead))?1:0)) % 1024,
           (UL_info->subframe+sf_ahead)%10);
-
+      /*
+      gNB_dlsch_ulsch_scheduler(module_id,
+          (UL_info->frame+((UL_info->subframe>(9-sf_ahead))?1:0)) % 1024,
+          (UL_info->subframe+sf_ahead)%10);
+      */
       ifi->CC_mask            = 0;
 
       sched_info->module_id   = module_id;