maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/remove-not-needed-global-vars' into integration_2024_w49 (!3140)

Browse Source 
remove un-necessary global variables

Remove global variables that can be removed by a trivial way:
- simply dead globals
- or reference is a single source, so can be static

setting them static reduces the scope, that is a progress, but of course as
for all static variables, the code is still not re-entrant
This commit is contained in:
Jaroslava Fiedlerova
2024-12-06 11:51:29 +01:00
parent fee95ed36f 5e00850aee
commit 797bc1b285
48 changed files with 443 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/MME_APP/mme_app.c
+14 -312
View File
@@ -60,93 +60,6 @@ extern RAN_CONTEXT_t RC;
#include "executables/lte-softmodem.h"
/*------------------------------------------------------------------------------*/
//static uint32_t MCE_app_register(ngran_node_t node_type,uint32_t mce_id_start, uint32_t mce_id_end) {
// uint32_t mce_id;
// MessageDef *msg_p;
// uint32_t register_mce_pending = 0;
//
// for (mce_id = mce_id_start; (mce_id < mce_id_end) ; mce_id++) {
// {
// // M3AP registration
// /* note: there is an implicit relationship between the data structure and the message name */
// msg_p = itti_alloc_new_message (TASK_MME_APP, 0, M3AP_REGISTER_MCE_REQ);
// //RCconfig_S1(msg_p, mce_id);
//
// //if (mce_id == 0)
// //RCconfig_gtpu();
//
// //LOG_I(MME_APP,"default drx %d\n",((M3AP_REGISTER_MCE_REQ(msg_p)).default_drx));
//
// LOG_I(ENB_APP,"[MCE %d] MCE_app_register via M3AP for instance %d\n", mce_id, ENB_MODULE_ID_TO_INSTANCE(mce_id));
// itti_send_msg_to_task (TASK_M3AP, ENB_MODULE_ID_TO_INSTANCE(mce_id), msg_p);
//
// //{ // S1AP registration
// // /* note: there is an implicit relationship between the data structure and the message name */
// // msg_p = itti_alloc_new_message (TASK_ENB_APP, 0, S1AP_REGISTER_ENB_REQ);
// // RCconfig_S1(msg_p, enb_id);
//
// // if (enb_id == 0) RCconfig_gtpu();
//
// // LOG_I(ENB_APP,"default drx %d\n",((S1AP_REGISTER_ENB_REQ(msg_p)).default_drx));
//
// // LOG_I(ENB_APP,"[eNB %d] eNB_app_register via S1AP for instance %d\n", enb_id, ENB_MODULE_ID_TO_INSTANCE(enb_id));
// // itti_send_msg_to_task (TASK_S1AP, ENB_MODULE_ID_TO_INSTANCE(enb_id), msg_p);
// //}
//
// register_mce_pending++;
// }
// }
//
// return register_mce_pending;
//}
/*------------------------------------------------------------------------------*/
//static uint32_t MCE_app_register_x2(uint32_t mce_id_start, uint32_t mce_id_end) {
// uint32_t mce_id;
// MessageDef *msg_p;
// uint32_t register_mce_m2_pending = 0;
//
// for (mce_id = mce_id_start; (mce_id < mce_id_end) ; mce_id++) {
// {
// msg_p = itti_alloc_new_message (TASK_ENB_APP, 0, X2AP_REGISTER_ENB_REQ);
// RCconfig_X2(msg_p, mce_id);
// itti_send_msg_to_task (TASK_X2AP, ENB_MODULE_ID_TO_INSTANCE(mce_id), msg_p);
// register_mce_x2_pending++;
// }
// }
//
// return register_mce_x2_pending;
//}
/*------------------------------------------------------------------------------*/
//static uint32_t MCE_app_register_m2(uint32_t mce_id_start, uint32_t mce_id_end) {
// uint32_t mce_id;
// MessageDef *msg_p;
// uint32_t register_mce_m2_pending = 0;
//
// LOG_W(MME_APP,"Register ...");
// for (mce_id = mce_id_start; (mce_id < mce_id_end) ; mce_id++) {
// {
// // LOG_W(MME_APP,"Register commes inside ...\n");
// msg_p = itti_alloc_new_message (TASK_MME_APP, 0, M2AP_REGISTER_MCE_REQ);
// //RCconfig_M2_MCE(msg_p, mce_id);
// itti_send_msg_to_task (TASK_M2AP_MCE, ENB_MODULE_ID_TO_INSTANCE(mce_id), msg_p);
// // LOG_W(MME_APP,"Register sent ...\n");
// register_mce_m2_pending++;
// }
// }
//
// return register_mce_m2_pending;
//}
//
//
//
static uint32_t MME_app_handle_m3ap_setup_req(instance_t instance){
//uint32_t mce_id=0;
@@ -156,31 +69,13 @@ static uint32_t MME_app_handle_m3ap_setup_req(instance_t instance){
return 0;
}
static uint32_t MME_app_handle_m3ap_session_start_resp(instance_t instance){
return 0;
}
//
//static uint32_t MME_app_handle_m3ap_session_stop_resp(instance_t instance){
//
//
// return 0;
//}
//
//static uint32_t MCE_app_send_m2ap_mbms_scheduling_information(instance_t instance){
//
// uint32_t mce_id=0;
// MessageDef *msg_p;
// msg_p = itti_alloc_new_message (TASK_MME_APP, 0, M2AP_MBMS_SCHEDULING_INFORMATION);
// itti_send_msg_to_task (TASK_M2AP_MCE, ENB_MODULE_ID_TO_INSTANCE(instance), msg_p);
//
// return 0;
//}
//
static uint32_t MME_app_send_m3ap_session_start_req(instance_t instance){
//uint32_t mce_id=0;
@@ -190,15 +85,7 @@ static uint32_t MME_app_send_m3ap_session_start_req(instance_t instance){
return 0;
}
//static uint32_t MME_app_send_m3ap_session_stop_req(instance_t instance){
//
// //uint32_t mce_id=0;
// MessageDef *msg_p;
// msg_p = itti_alloc_new_message (TASK_MME_APP, 0, M3AP_MBMS_SESSION_STOP_REQ);
// itti_send_msg_to_task (TASK_M3AP_MME, ENB_MODULE_ID_TO_INSTANCE(instance), msg_p);
//
// return 0;
//}
static uint32_t MME_app_send_m3ap_session_update_req(instance_t instance){
//uint32_t mce_id=0;
@@ -209,19 +96,8 @@ static uint32_t MME_app_send_m3ap_session_update_req(instance_t instance){
return 0;
}
/*------------------------------------------------------------------------------*/
void *MME_app_task(void *args_p) {
//uint32_t mce_nb = RC.nb_inst;
//uint32_t mce_id_start = 0;
//uint32_t mce_id_end = mce_id_start + mce_nb;
//uint32_t register_mce_pending=0;
//uint32_t registered_mce=0;
//long mce_register_retry_timer_id;
//uint32_t m2_register_mce_pending = 0;
// uint32_t x2_registered_mce = 0;
// long x2_mce_register_retry_timer_id;
// uint32_t m2_register_mce_pending = 0;
// uint32_t m2_registered_mce = 0;
// long m2_mce_register_retry_timer_id;
void *MME_app_task(void *args_p)
{
long m3_mme_register_session_start_timer_id;
MessageDef *msg_p = NULL;
instance_t instance;
@@ -232,7 +108,7 @@ void *MME_app_task(void *args_p) {
/* Try to register each MCE */
// This assumes that node_type of all RRC instances is the same
if (EPC_MODE_ENABLED) {
if (!IS_SOFTMODEM_NOS1) {
//register_mce_pending = MCE_app_register(RC.rrc[0]->node_type, mce_id_start, mce_id_end);
}
@@ -264,200 +140,26 @@ void *MME_app_task(void *args_p) {
break;
case M3AP_REGISTER_MCE_CNF: //M3AP_REGISTER_MCE_CNF debería
//AssertFatal(!NODE_IS_DU(RC.rrc[0]->node_type), "Should not have received S1AP_REGISTER_ENB_CNF\n");
// if (EPC_MODE_ENABLED) {
// LOG_I(MME_APP, "[MCE %d] Received %s: associated MME %d\n", instance, ITTI_MSG_NAME (msg_p),
// M3AP_REGISTER_MCE_CNF(msg_p).nb_mme);
// DevAssert(register_mce_pending > 0);
// register_mce_pending--;
// /* Check if at least MCE is registered with one MME */
// if (M3AP_REGISTER_MCE_CNF(msg_p).nb_mme > 0) {
// registered_mce++;
// }
// /* Check if all register MCE requests have been processed */
// if (register_mce_pending == 0) {
// if (registered_mce == mce_nb) {
// /* If all MCE are registered, start L2L1 task */
// // MessageDef *msg_init_p;
// // msg_init_p = itti_alloc_new_message (TASK_ENB_APP, 0, INITIALIZE_MESSAGE);
// // itti_send_msg_to_task (TASK_L2L1, INSTANCE_DEFAULT, msg_init_p);
// } else {
// LOG_W(MME_APP, " %d MCE not associated with a MME, retrying registration in %d seconds ...\n",
// mce_nb - registered_mce, MCE_REGISTER_RETRY_DELAY);
// /* Restart the MCE registration process in MCE_REGISTER_RETRY_DELAY seconds */
// if (timer_setup (MCE_REGISTER_RETRY_DELAY, 0, TASK_MME_APP, INSTANCE_DEFAULT, TIMER_ONE_SHOT,
// NULL, &mce_register_retry_timer_id) < 0) {
// LOG_E(MME_APP, " Can not start MCE register retry timer, use \"sleep\" instead!\n");
// sleep(MCE_REGISTER_RETRY_DELAY);
// /* Restart the registration process */
// registered_mce = 0;
// register_mce_pending = MCE_app_register (RC.rrc[0]->node_type,mce_id_start, mce_id_end);
// }
// }
// }
// } /* if (EPC_MODE_ENABLED) */
break;
// case M3AP_SETUP_RESP:
// //LOG_I(MME_APP, "Received %s: associated ngran_MCE_CU %s with %d cells to activate\n", ITTI_MSG_NAME (msg_p),
//
// handle_m3ap_setup_resp(&M3AP_SETUP_RESP(msg_p));
// DevAssert(register_mce_pending > 0);
// register_mce_pending--;
// /* Check if at least MCE is registered with one MME */
// //if (M3AP_SETUP_RESP(msg_p).num_cells_to_activate > 0) {
// // registered_enb++;
// //}
// /* Check if all register MCE requests have been processed */
// if (register_mce_pending == 0) {
// if (registered_mce == mce_nb) {
// /* If all MCE cells are registered, start L2L1 task */
// MessageDef *msg_init_p;
// //msg_init_p = itti_alloc_new_message (TASK_MME_APP, 0, INITIALIZE_MESSAGE);
// //itti_send_msg_to_task (TASK_L2L1, INSTANCE_DEFAULT, msg_init_p);
// } else {
// LOG_W(MME_APP, " %d MCE not associated with a MME, retrying registration in %d seconds ...\n",
// mce_nb - registered_mce, MCE_REGISTER_RETRY_DELAY);
// /* Restart the MCE registration process in MCE_REGISTER_RETRY_DELAY seconds */
// if (timer_setup (MCE_REGISTER_RETRY_DELAY, 0, TASK_MME_APP, INSTANCE_DEFAULT, TIMER_ONE_SHOT,
// NULL, &mce_register_retry_timer_id) < 0) {
// LOG_E(ENB_APP, " Can not start MCE register retry timer, use \"sleep\" instead!\n");
// sleep(MCE_REGISTER_RETRY_DELAY);
// /* Restart the registration process */
// registered_mce = 0;
// register_mce_pending = MCE_app_register (RC.rrc[0]->node_type,mce_id_start, mce_id_end);//, enb_properties_p);
// }
// }
// }
// break;
case M3AP_DEREGISTERED_MCE_IND: //M3AP_DEREGISTERED_MCE_IND debería
if (EPC_MODE_ENABLED) {
LOG_W(MME_APP, "[MCE %ld] Received %s: associated MME %d\n", instance, ITTI_MSG_NAME (msg_p),
M3AP_DEREGISTERED_MCE_IND(msg_p).nb_mme);
/* TODO handle recovering of registration */
if (!IS_SOFTMODEM_NOS1) {
LOG_W(MME_APP,
"[MCE %ld] Received %s: associated MME %d\n",
instance,
ITTI_MSG_NAME(msg_p),
M3AP_DEREGISTERED_MCE_IND(msg_p).nb_mme);
/* TODO handle recovering of registration */
}
break;
case TIMER_HAS_EXPIRED:
//if (EPC_MODE_ENABLED) {
// LOG_I(MME_APP, " Received %s: timer_id %ld\n", ITTI_MSG_NAME (msg_p), TIMER_HAS_EXPIRED(msg_p).timer_id);
// if (TIMER_HAS_EXPIRED (msg_p).timer_id == mce_register_retry_timer_id) {
// /* Restart the registration process */
// registered_mce = 0;
// //register_mce_pending = MCE_app_register (RC.rrc[0]->node_type, mce_id_start, mce_id_end);
// }
// //if (TIMER_HAS_EXPIRED (msg_p).timer_id == x2_mce_register_retry_timer_id) {
// // /* Restart the registration process */
// // x2_registered_mce = 0;
// // x2_register_mce_pending = MCE_app_register_x2 (mce_id_start, mce_id_end);
// //}
//} /* if (EPC_MODE_ENABLED) */
if(TIMER_HAS_EXPIRED(msg_p).timer_id == m3_mme_register_session_start_timer_id){
MME_app_send_m3ap_session_start_req(0);
if (TIMER_HAS_EXPIRED(msg_p).timer_id == m3_mme_register_session_start_timer_id) {
MME_app_send_m3ap_session_start_req(0);
}
break;
// case X2AP_DEREGISTERED_ENB_IND:
// LOG_W(ENB_APP, "[MCE %d] Received %s: associated MCE %d\n", instance, ITTI_MSG_NAME (msg_p),
// X2AP_DEREGISTERED_ENB_IND(msg_p).nb_x2);
// /* TODO handle recovering of registration */
// break;
// case X2AP_REGISTER_ENB_CNF:
// LOG_I(ENB_APP, "[MCE %d] Received %s: associated MCE %d\n", instance, ITTI_MSG_NAME (msg_p),
// X2AP_REGISTER_ENB_CNF(msg_p).nb_x2);
// DevAssert(x2_register_enb_pending > 0);
// x2_register_enb_pending--;
// /* Check if at least MCE is registered with one target MCE */
// if (X2AP_REGISTER_ENB_CNF(msg_p).nb_x2 > 0) {
// x2_registered_enb++;
// }
// /* Check if all register MCE requests have been processed */
// if (x2_register_enb_pending == 0) {
// if (x2_registered_enb == enb_nb) {
// /* If all MCE are registered, start RRC HO task */
// } else {
// uint32_t x2_not_associated = enb_nb - x2_registered_enb;
// LOG_W(ENB_APP, " %d MCE %s not associated with the target\n",
// x2_not_associated, x2_not_associated > 1 ? "are" : "is");
// // timer to retry
// /* Restart the MCE registration process in ENB_REGISTER_RETRY_DELAY seconds */
// if (timer_setup (X2AP_ENB_REGISTER_RETRY_DELAY, 0, TASK_ENB_APP,
// INSTANCE_DEFAULT, TIMER_ONE_SHOT, NULL,
// &x2_enb_register_retry_timer_id) < 0) {
// LOG_E(ENB_APP, " Can not start MCE X2AP register: retry timer, use \"sleep\" instead!\n");
// sleep(X2AP_ENB_REGISTER_RETRY_DELAY);
// /* Restart the registration process */
// x2_registered_enb = 0;
// x2_register_enb_pending = MCE_app_register_x2 (enb_id_start, enb_id_end);
// }
// }
// }
// break;
// case M2AP_DEREGISTERED_ENB_IND:
// LOG_W(ENB_APP, "[MCE %d] Received %s: associated MCE %d\n", instance, ITTI_MSG_NAME (msg_p),
// M2AP_DEREGISTERED_ENB_IND(msg_p).nb_m2);
// /* TODO handle recovering of registration */
// break;
// case M2AP_REGISTER_ENB_CNF:
// LOG_I(ENB_APP, "[MCE %d] Received %s: associated MCE %d\n", instance, ITTI_MSG_NAME (msg_p),
// M2AP_REGISTER_ENB_CNF(msg_p).nb_m2);
// DevAssert(m2_register_enb_pending > 0);
// m2_register_enb_pending--;
// /* Check if at least MCE is registered with one target MCE */
// if (M2AP_REGISTER_ENB_CNF(msg_p).nb_m2 > 0) {
// m2_registered_enb++;
// }
// /* Check if all register MCE requests have been processed */
// if (m2_register_enb_pending == 0) {
// if (m2_registered_enb == enb_nb) {
// /* If all MCE are registered, start RRC HO task */
// } else {
// uint32_t m2_not_associated = enb_nb - m2_registered_enb;
// LOG_W(ENB_APP, " %d MCE %s not associated with the target\n",
// m2_not_associated, m2_not_associated > 1 ? "are" : "is");
// // timer to retry
// /* Restart the MCE registration process in ENB_REGISTER_RETRY_DELAY seconds */
// //if (timer_setup (X2AP_ENB_REGISTER_RETRY_DELAY, 0, TASK_ENB_APP,
// // INSTANCE_DEFAULT, TIMER_ONE_SHOT, NULL,
// // &x2_enb_register_retry_timer_id) < 0) {
// // LOG_E(ENB_APP, " Can not start MCE X2AP register: retry timer, use \"sleep\" instead!\n");
// // sleep(X2AP_ENB_REGISTER_RETRY_DELAY);
// // /* Restart the registration process */
// // x2_registered_enb = 0;
// // x2_register_enb_pending = MCE_app_register_x2 (enb_id_start, enb_id_end);
// //}
// }
// }
// break;
case M3AP_RESET:
LOG_I(MME_APP,"Received M3AP_RESET message %s\n",ITTI_MSG_NAME(msg_p));
break;
openair3/NGAP/ngap_gNB_management_procedures.c
+1 -1
View File
@@ -39,7 +39,7 @@
#include "queue.h"
#include "tree.h"
ngap_gNB_internal_data_t ngap_gNB_internal_data;
static ngap_gNB_internal_data_t ngap_gNB_internal_data;
RB_GENERATE(ngap_amf_map, ngap_gNB_amf_data_s, entry, ngap_gNB_compare_assoc_id);
openair3/S1AP/s1ap_eNB.c
-2
View File
@@ -63,8 +63,6 @@
#include "oaisim_mme_test_s1c.h"
#endif
s1ap_eNB_config_t s1ap_config;
static int s1ap_eNB_generate_s1_setup_request(
s1ap_eNB_instance_t *instance_p, s1ap_eNB_mme_data_t *s1ap_mme_data_p);
openair3/S1AP/s1ap_eNB.h
-9
View File
@@ -46,15 +46,6 @@ typedef enum s1ap_timer_type_s {
S1AP_TIMER_TYPE_MAX,
} s1ap_timer_type_t;
typedef struct s1ap_eNB_config_s {
// MME related params
unsigned char mme_enabled; ///< MME enabled ?
} s1ap_eNB_config_t;
extern s1ap_eNB_config_t s1ap_config;
#define EPC_MODE_ENABLED s1ap_config.mme_enabled
void *s1ap_eNB_process_itti_msg(void*);
void s1ap_eNB_init(void);
void *s1ap_eNB_task(void *arg);
openair3/S1AP/s1ap_eNB_management_procedures.c
+1 -1
View File
@@ -41,7 +41,7 @@
#include "s1ap_eNB_defs.h"
#include "s1ap_eNB.h"
s1ap_eNB_internal_data_t s1ap_eNB_internal_data;
static s1ap_eNB_internal_data_t s1ap_eNB_internal_data;
RB_GENERATE(s1ap_mme_map, s1ap_eNB_mme_data_s, entry, s1ap_eNB_compare_assoc_id);
openair3/ocp-gtpu/gtp_itf.cpp
+1 -1
View File
@@ -155,7 +155,7 @@ class gtpEndPoints {
}
};
gtpEndPoints globGtp;
static gtpEndPoints globGtp;
// note TEid 0 is reserved for specific usage: echo req/resp, error and supported extensions
static teid_t gtpv1uNewTeid(void) {