Merge remote-tracking branch 'origin/develop' into nr_prs

executables/nr-uesoftmodem.c

@@ -245,20 +245,7 @@ uint64_t set_nrUE_optmask(uint64_t bitmask) {
 nrUE_params_t *get_nrUE_params(void) {
   return &nrUE_params;
 }
-/* initialie thread pools used for NRUE processing paralleliation */ 
-void init_tpools(uint8_t nun_dlsch_threads) {
-  char params[NR_RX_NB_TH*NR_NB_TH_SLOT*3+1]={0};
-  for (int i=0; i<NR_RX_NB_TH*NR_NB_TH_SLOT; i++) {
-    memcpy(params+(i*3),"-1,",3);
-  }
-  if (getenv("noThreads")) {
-     initTpool("n", &(nrUE_params.Tpool), false);
-     init_dlsch_tpool(0);
-   } else {
-     initTpool(params, &(nrUE_params.Tpool), false);
-     init_dlsch_tpool( nun_dlsch_threads);
-   }
-}
+
 static void get_options(void) {
 
   paramdef_t cmdline_params[] =CMDLINE_NRUEPARAMS_DESC ;
@@ -442,7 +429,7 @@ int main( int argc, char **argv ) {
 #if T_TRACER
   T_Config_Init();
 #endif
-  init_tpools(nrUE_params.nr_dlsch_parallel);
+  initTpool(get_softmodem_params()->threadPoolConfig, &(nrUE_params.Tpool), cpumeas(CPUMEAS_GETSTATE));
   //randominit (0);
   set_taus_seed (0);
 
@@ -451,7 +438,7 @@ int main( int argc, char **argv ) {
 
   init_opt() ;
   load_nrLDPClib(NULL);
-
+ 
   if (ouput_vcd) {
     vcd_signal_dumper_init("/tmp/openair_dump_nrUE.vcd");
   }