From f9c3ff3ca3839b0c9d555d8a249ebeff8297b187 Mon Sep 17 00:00:00 2001
From: Sakthivel Velumani <velumani@eurecom.fr>
Date: Wed, 25 Nov 2020 11:12:32 +0100
Subject: [PATCH] Updated the config files

---
 executables/nr-gnb.c                                        | 6 ++++--
 executables/nr-softmodem.c                                  | 2 ++
 executables/thread-common.h                                 | 4 ----
 openair1/PHY/defs_common.h                                  | 1 -
 openair2/GNB_APP/gnb_paramdef.h                             | 5 ++++-
 .../CONF/gnb.band78.tm1.106PRB.usrpn300.conf                | 2 +-
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf      | 1 +
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 88351c9d5e..2f3c89f5e4 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -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;
   }
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index 8271e66e2f..adda039eaf 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -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;
diff --git a/executables/thread-common.h b/executables/thread-common.h
index c5e8587e77..6f3af3cfc0 100644
--- a/executables/thread-common.h
+++ b/executables/thread-common.h
@@ -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
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index e7cc5923ba..27765a8548 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -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;
diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h
index 84da1de530..d892e667d4 100644
--- a/openair2/GNB_APP/gnb_paramdef.h
+++ b/openair2/GNB_APP/gnb_paramdef.h
@@ -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
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
index 255cfb08dc..47876154cb 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
@@ -1,6 +1,7 @@
 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;
   }
 );
 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
index fd1b62fd3d..e34b261500 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-Eurecom-5GNRBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (