Commit b363b71e authored by Robert Schmidt's avatar Robert Schmidt

fix: repair RC.mac memory allocation

- there can be a race between the FlexRAN agent reading the RC.mac and its
  allocation in main.c
- in order to circumvent this, change the allocation by allocationg everything
  "into" a local variable
- finally "make it visible" by storing the pointer in RC.mac
parent 184d51c6
...@@ -51,87 +51,73 @@ extern RAN_CONTEXT_t RC; ...@@ -51,87 +51,73 @@ extern RAN_CONTEXT_t RC;
void mac_top_init_eNB(void) void mac_top_init_eNB(void)
{ {
module_id_t i, j; module_id_t i, j;
int list_el; int list_el;
UE_list_t *UE_list; UE_list_t *UE_list;
eNB_MAC_INST *mac; eNB_MAC_INST **mac;
LOG_I(MAC, "[MAIN] Init function start:nb_macrlc_inst=%d\n", LOG_I(MAC, "[MAIN] Init function start:nb_macrlc_inst=%d\n",
RC.nb_macrlc_inst); RC.nb_macrlc_inst);
if (RC.nb_macrlc_inst > 0) { if (RC.nb_macrlc_inst <= 0) {
RC.mac = RC.mac = NULL;
(eNB_MAC_INST **) malloc16(RC.nb_macrlc_inst * return;
sizeof(eNB_MAC_INST *)); }
AssertFatal(RC.mac != NULL,
mac = malloc16(RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *));
AssertFatal(mac != NULL,
"can't ALLOCATE %zu Bytes for %d eNB_MAC_INST with size %zu \n", "can't ALLOCATE %zu Bytes for %d eNB_MAC_INST with size %zu \n",
RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *), RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *),
RC.nb_macrlc_inst, sizeof(eNB_MAC_INST)); RC.nb_macrlc_inst, sizeof(eNB_MAC_INST));
for (i = 0; i < RC.nb_macrlc_inst; i++) { for (i = 0; i < RC.nb_macrlc_inst; i++) {
RC.mac[i] = (eNB_MAC_INST *) malloc16(sizeof(eNB_MAC_INST)); mac[i] = malloc16(sizeof(eNB_MAC_INST));
AssertFatal(RC.mac != NULL, AssertFatal(mac[i] != NULL,
"can't ALLOCATE %zu Bytes for %d eNB_MAC_INST with size %zu \n", "can't ALLOCATE %zu Bytes for %d eNB_MAC_INST with size %zu \n",
RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *), RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *),
RC.nb_macrlc_inst, sizeof(eNB_MAC_INST)); RC.nb_macrlc_inst, sizeof(eNB_MAC_INST));
LOG_D(MAC, LOG_D(MAC,
"[MAIN] ALLOCATE %zu Bytes for %d eNB_MAC_INST @ %p\n", "[MAIN] ALLOCATE %zu Bytes for %d eNB_MAC_INST @ %p\n",
sizeof(eNB_MAC_INST), RC.nb_macrlc_inst, RC.mac); sizeof(eNB_MAC_INST), RC.nb_macrlc_inst, mac);
bzero(RC.mac[i], sizeof(eNB_MAC_INST)); bzero(mac[i], sizeof(eNB_MAC_INST));
RC.mac[i]->Mod_id = i; mac[i]->Mod_id = i;
for (j = 0; j < MAX_NUM_CCs; j++) { for (j = 0; j < MAX_NUM_CCs; j++) {
RC.mac[i]->DL_req[j].dl_config_request_body. mac[i]->DL_req[j].dl_config_request_body.dl_config_pdu_list =
dl_config_pdu_list = RC.mac[i]->dl_config_pdu_list[j]; mac[i]->dl_config_pdu_list[j];
RC.mac[i]->UL_req[j].ul_config_request_body. mac[i]->UL_req[j].ul_config_request_body.ul_config_pdu_list =
ul_config_pdu_list = RC.mac[i]->ul_config_pdu_list[j]; mac[i]->ul_config_pdu_list[j];
for (int k = 0; k < 10; k++) for (int k = 0; k < 10; k++)
RC.mac[i]->UL_req_tmp[j][k]. mac[i]->UL_req_tmp[j][k].ul_config_request_body.ul_config_pdu_list =
ul_config_request_body.ul_config_pdu_list = mac[i]->ul_config_pdu_list_tmp[j][k];
RC.mac[i]->ul_config_pdu_list_tmp[j][k]; mac[i]->HI_DCI0_req[j].hi_dci0_request_body.hi_dci0_pdu_list =
RC.mac[i]->HI_DCI0_req[j]. mac[i]->hi_dci0_pdu_list[j];
hi_dci0_request_body.hi_dci0_pdu_list = mac[i]->TX_req[j].tx_request_body.tx_pdu_list = mac[i]->tx_request_pdu[j];
RC.mac[i]->hi_dci0_pdu_list[j]; mac[i]->ul_handle = 0;
RC.mac[i]->TX_req[j].tx_request_body.tx_pdu_list =
RC.mac[i]->tx_request_pdu[j];
RC.mac[i]->ul_handle = 0;
}
} }
AssertFatal(rlc_module_init() == 0, mac[i]->if_inst = IF_Module_init(i);
"Could not initialize RLC layer\n");
// These should be out of here later
pdcp_layer_init();
rrc_init_global_param();
} else {
RC.mac = NULL;
}
// Initialize Linked-List for Active UEs
for (i = 0; i < RC.nb_macrlc_inst; i++) {
mac = RC.mac[i];
mac->if_inst = IF_Module_init(i);
UE_list = &mac->UE_list;
UE_list = &mac[i]->UE_list;
UE_list->num_UEs = 0; UE_list->num_UEs = 0;
UE_list->head = -1; UE_list->head = -1;
UE_list->head_ul = -1; UE_list->head_ul = -1;
UE_list->avail = 0; UE_list->avail = 0;
for (list_el = 0; list_el < NUMBER_OF_UE_MAX - 1; list_el++) { for (list_el = 0; list_el < NUMBER_OF_UE_MAX - 1; list_el++) {
UE_list->next[list_el] = list_el + 1; UE_list->next[list_el] = list_el + 1;
UE_list->next_ul[list_el] = list_el + 1; UE_list->next_ul[list_el] = list_el + 1;
} }
UE_list->next[list_el] = -1; UE_list->next[list_el] = -1;
UE_list->next_ul[list_el] = -1; UE_list->next_ul[list_el] = -1;
} }
RC.mac = mac;
AssertFatal(rlc_module_init() == 0,
"Could not initialize RLC layer\n");
// These should be out of here later
pdcp_layer_init();
rrc_init_global_param();
} }
void mac_init_cell_params(int Mod_idP, int CC_idP) void mac_init_cell_params(int Mod_idP, int CC_idP)
......
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