Commit f9c3ff3c authored by Sakthivel Velumani's avatar Sakthivel Velumani

Updated the config files

parent 80ea0393
develop NRUE_usedlschparallel NR_10MHz NR_DLUL_PF NR_DLUL_PF_4UL NR_DLUL_PF_rebased NR_DL_MIMO NR_FAPI_beamindex_SSB_RO NR_FDD_FIX NR_FR2_RA NR_MAC_Multi_Rach_GlobalEdge NR_MAC_TCI_UCI_GlobalEdge NR_PUCCH_MultiUE NR_RA_cleanup NR_SA_F1AP_RFSIMULATOR NR_SA_F1AP_RFSIMULATOR2 NR_SA_F1AP_dev NR_SA_itti_sim_wk48 NR_SA_itti_sim_wk48_hs1 NR_SCHED_HARQ NR_SCHED_PDCCH_PUCCH_HARQ NR_SCHED_PDCCH_PUCCH_HARQ_rebased NR_SCHED_fixes NR_UE_dlsch_bugfix NR_Wireshark NR_beam_simulation NR_scheduling_request NR_scheduling_request2 NR_scheduling_request3 benetel_driver_uldl_pf_merge benetel_driver_update bugfix-x2-SgNBAdditionRequest bupt-sa-merge ci-test cleanup_softmodem_main develop-SA-RA develop-SnT develop-sib1 develop-sib1-local develop-sib1-lts develop-sib1-update develop-sib1-update-test1 develop-sib1-update-ue develop_stable fix_NR_DLUL_PF fix_do_ra_data fixes-CE-RLC-PDU-size gnb-only-test integration_2020_wk50 integration_2020_wk50_1 integration_2020_wk51 integration_2020_wk51_2 integration_2021_wk02 integration_2021_wk02_wMR988 integration_2021_wk04 integration_2021_wk05 inter-RRU-final itti-enhancement lte-ulsch-bugfix lte_uplink_improvement minor-fix-doc-basic-sim nasmesh_kernel_5.8 new-gtpu nfapi_nr_develop nr_ul_pf nr_ul_scfdma oairu oairu-dockerfile-support openxg/develop ptrs_rrc_config pusch-mthread-scaling-fix pusch-retrans-fix-ue rh-ci-add-ue-parallelization rh_ci_ra_fr2 rh_ci_ue_parallel rh_wk50_debug s1-subnormal_rewrite s1_subnormal s1_subnormal-robert sa-merge-rrc-srb sa-msg4 sa-msg4-rrc sa-msg4-rrc-yihz sa-msg4-rrc-yihz-hs sa_rrc_yihz small-config-change ue-fixes ue_beam_selection ul-freq-iq-samps-to-file wireshark-T-hack-ueid wireshark-log-scheduling-requests xiangwab xiangwan 2021.w04 2021.w02 2020.w51_2 2020.w51 2020.w50
No related merge requests found
......@@ -100,6 +100,8 @@ extern int transmission_mode;
extern uint16_t sf_ahead;
extern uint16_t sl_ahead;
extern uint32_t num_threads_pusch;
//pthread_t main_gNB_thread;
time_stats_t softmodem_stats_mt; // main thread
......@@ -870,11 +872,11 @@ void init_gNB_proc(int inst) {
gNB->threadPool = (tpool_t*)malloc(sizeof(tpool_t));
gNB->respDecode = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
int numCPU = sysconf(_SC_NPROCESSORS_ONLN);
int threadCnt = min(numCPU, get_uldeocde_thread_count());
int threadCnt = min(numCPU, num_threads_pusch);
char ul_pool[80];
sprintf(ul_pool,"-1");
int s_offset = 0;
for (int icpu=2; icpu<threadCnt; icpu++) {
for (int icpu=1; icpu<threadCnt; icpu++) {
sprintf(ul_pool+2+s_offset,",-1");
s_offset += 3;
}
......
......@@ -98,6 +98,8 @@ int config_sync_var=-1;
volatile int start_gNB = 0;
volatile int oai_exit = 0;
uint32_t num_threads_pusch;
static int wait_for_sync = 0;
unsigned int mmapped_dma=0;
......
......@@ -39,8 +39,4 @@ static inline WORKER_CONF_t get_thread_worker_conf(void) {
return thread_struct.worker_conf;
}
static inline uint8_t get_uldeocde_thread_count(void) {
return thread_struct.numULProcThreads;
}
#endif
......@@ -891,7 +891,6 @@ typedef enum {
typedef struct THREAD_STRUCT_s {
PARALLEL_CONF_t parallel_conf;
WORKER_CONF_t worker_conf;
uint8_t numULProcThreads;
} THREAD_STRUCT;
typedef enum {SF_DL, SF_UL, SF_S} lte_subframe_t;
......
......@@ -50,6 +50,7 @@
extern int asn_debug;
extern int asn1_xer_print;
extern uint32_t num_threads_pusch;
#ifdef LIBCONFIG_LONG
#define libconfig_int long
......@@ -83,13 +84,15 @@ typedef enum {
/* global parameters, not under a specific section */
#define GNB_CONFIG_STRING_ASN1_VERBOSITY "Asn1_verbosity"
#define GNB_CONFIG_STRING_ACTIVE_GNBS "Active_gNBs"
#define GNB_CONFIG_PUSCH_THREADS "Num_Threads_PUSCH"
/*--------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/* global configuration parameters */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*--------------------------------------------------------------------------------------------------------------------------------------------------------------*/
#define GNBSPARAMS_DESC { \
{GNB_CONFIG_STRING_ASN1_VERBOSITY, NULL, 0, uptr:NULL, defstrval:GNB_CONFIG_STRING_ASN1_VERBOSITY_NONE, TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_ACTIVE_GNBS, NULL, 0, uptr:NULL, defstrval:NULL, TYPE_STRINGLIST, 0} \
{GNB_CONFIG_STRING_ACTIVE_GNBS, NULL, 0, uptr:NULL, defstrval:NULL, TYPE_STRINGLIST, 0}, \
{GNB_CONFIG_PUSCH_THREADS, NULL, 0, uptr:&num_threads_pusch, defuintval:1, TYPE_UINT, 0} \
}
#define GNB_ASN1_VERBOSITY_IDX 0
#define GNB_ACTIVE_GNBS_IDX 1
......
Active_gNBs = ( "gNB-Eurecom-5GNRBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
Num_Threads_PUSCH = 8;
gNBs =
(
......@@ -260,7 +261,6 @@ THREAD_STRUCT = (
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
numULProcThreads = 8;
}
);
......
Active_gNBs = ( "gNB-Eurecom-5GNRBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
Num_Threads_PUSCH = 8;
gNBs =
(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment