Merge remote-tracking branch 'origin/fix-gnb-ue-memory-leaks' into integration_2024_w32

executables/nr-softmodem-common.h

@@ -87,8 +87,6 @@
 
 #define CONFIG_HLP_NUMEROLOGY    "adding numerology for 5G\n"
 #define CONFIG_HLP_EMULATE_RF    "Emulated RF enabled(disable by defult)\n"
-#define CONFIG_HLP_PARALLEL_CMD  "three config for level of parallelism 'PARALLEL_SINGLE_THREAD', 'PARALLEL_RU_L1_SPLIT', or 'PARALLEL_RU_L1_TRX_SPLIT'\n"
-#define CONFIG_HLP_WORKER_CMD    "two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'\n"
 #define CONFIG_HLP_USRP_THREAD   "having extra thead for usrp tx\n"
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
 #define CONFIG_HLP_USRP_ARGS     "set the arguments to identify USRP (same syntax as in UHD)\n"

executables/nr-softmodem.c

@@ -150,9 +150,6 @@ int emulate_rf = 0;
 int numerology = 0;
 
 
-static char *parallel_config = NULL;
-static char *worker_config = NULL;
-
 /* struct for ethernet specific parameters given in eNB conf file */
 eth_params_t *eth_params;
 
@@ -423,10 +420,6 @@ static void get_options(configmodule_interface_t *cfg)
     NB_RU   = RC.nb_RU;
     printf("Configuration: nb_rrc_inst %d, nb_nr_L1_inst %d, nb_ru %hhu\n",NB_gNB_INST,RC.nb_nr_L1_inst,NB_RU);
   }
-
-  if(parallel_config != NULL) set_parallel_conf(parallel_config);
-
-  if(worker_config != NULL) set_worker_conf(worker_config);
 }
 
 void set_default_frame_parms(nfapi_nr_config_request_scf_t *config[MAX_NUM_CCs],
@@ -655,7 +648,8 @@ int main( int argc, char **argv ) {
 #define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
 #endif
   // strdup to put the sring in the core file for post mortem identification
-  LOG_I(HW, "Version: %s\n", strdup(PACKAGE_VERSION));
+  char *pckg = strdup(PACKAGE_VERSION);
+  LOG_I(HW, "Version: %s\n", pckg);
 
   // don't create if node doesn't connect to RRC/S1/GTP
   const ngran_node_t node_type = get_node_type();
@@ -810,6 +804,7 @@ int main( int argc, char **argv ) {
       RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
   }
 
+  free(pckg);
   logClean();
   printf("Bye.\n");
   return 0;

executables/nr-uesoftmodem.c

@@ -461,7 +461,8 @@ int main(int argc, char **argv)
 #define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
 #endif
   // strdup to put the sring in the core file for post mortem identification
-  LOG_I(HW, "Version: %s\n", strdup(PACKAGE_VERSION));
+  char *pckg = strdup(PACKAGE_VERSION);
+  LOG_I(HW, "Version: %s\n", pckg);
 
   PHY_vars_UE_g = malloc(sizeof(*PHY_vars_UE_g) * NB_UE_INST);
   for (int inst = 0; inst < NB_UE_INST; inst++) {
@@ -597,6 +598,7 @@ int main(int argc, char **argv)
     }
   }
 
+  free(pckg);
   return 0;
 }