Skip to content

O
OpenXG-RAN
Commit b363b71e authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 74 deletions
openair2/LAYER2/MAC/main.c
View file @ b363b71e
...@@ -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 = NULL;
RC.mac = return;
(eNB_MAC_INST **) malloc16(RC.nb_macrlc_inst * }
sizeof(eNB_MAC_INST *));
AssertFatal(RC.mac != NULL, mac = malloc16(RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *));
"can't ALLOCATE %zu Bytes for %d eNB_MAC_INST with size %zu \n", AssertFatal(mac != NULL,
RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *), "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 *),
for (i = 0; i < RC.nb_macrlc_inst; i++) { RC.nb_macrlc_inst, sizeof(eNB_MAC_INST));
RC.mac[i] = (eNB_MAC_INST *) malloc16(sizeof(eNB_MAC_INST)); for (i = 0; i < RC.nb_macrlc_inst; i++) {
AssertFatal(RC.mac != NULL, mac[i] = malloc16(sizeof(eNB_MAC_INST));
"can't ALLOCATE %zu Bytes for %d eNB_MAC_INST with size %zu \n", AssertFatal(mac[i] != NULL,
RC.nb_macrlc_inst * sizeof(eNB_MAC_INST *), "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 *),
LOG_D(MAC, RC.nb_macrlc_inst, sizeof(eNB_MAC_INST));
"[MAIN] ALLOCATE %zu Bytes for %d eNB_MAC_INST @ %p\n", LOG_D(MAC,
sizeof(eNB_MAC_INST), RC.nb_macrlc_inst, RC.mac); "[MAIN] ALLOCATE %zu Bytes for %d eNB_MAC_INST @ %p\n",
bzero(RC.mac[i], sizeof(eNB_MAC_INST)); sizeof(eNB_MAC_INST), RC.nb_macrlc_inst, mac);
RC.mac[i]->Mod_id = i; bzero(mac[i], sizeof(eNB_MAC_INST));
for (j = 0; j < MAX_NUM_CCs; j++) { mac[i]->Mod_id = i;
RC.mac[i]->DL_req[j].dl_config_request_body. for (j = 0; j < MAX_NUM_CCs; j++) {
dl_config_pdu_list = RC.mac[i]->dl_config_pdu_list[j]; mac[i]->DL_req[j].dl_config_request_body.dl_config_pdu_list =
RC.mac[i]->UL_req[j].ul_config_request_body. mac[i]->dl_config_pdu_list[j];
ul_config_pdu_list = RC.mac[i]->ul_config_pdu_list[j]; mac[i]->UL_req[j].ul_config_request_body.ul_config_pdu_list =
for (int k = 0; k < 10; k++) mac[i]->ul_config_pdu_list[j];
RC.mac[i]->UL_req_tmp[j][k]. for (int k = 0; k < 10; k++)
ul_config_request_body.ul_config_pdu_list = mac[i]->UL_req_tmp[j][k].ul_config_request_body.ul_config_pdu_list =
RC.mac[i]->ul_config_pdu_list_tmp[j][k]; mac[i]->ul_config_pdu_list_tmp[j][k];
RC.mac[i]->HI_DCI0_req[j]. mac[i]->HI_DCI0_req[j].hi_dci0_request_body.hi_dci0_pdu_list =
hi_dci0_request_body.hi_dci0_pdu_list = mac[i]->hi_dci0_pdu_list[j];
RC.mac[i]->hi_dci0_pdu_list[j]; mac[i]->TX_req[j].tx_request_body.tx_pdu_list = mac[i]->tx_request_pdu[j];
RC.mac[i]->TX_req[j].tx_request_body.tx_pdu_list = mac[i]->ul_handle = 0;
RC.mac[i]->tx_request_pdu[j];
RC.mac[i]->ul_handle = 0;
}
}
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();
} else {
RC.mac = NULL;
} }
// Initialize Linked-List for Active UEs mac[i]->if_inst = IF_Module_init(i);
for (i = 0; i < RC.nb_macrlc_inst; i++) {
mac = RC.mac[i];
UE_list = &mac[i]->UE_list;
UE_list->num_UEs = 0;
UE_list->head = -1;
UE_list->head_ul = -1;
UE_list->avail = 0;
for (list_el = 0; list_el < NUMBER_OF_UE_MAX - 1; list_el++) {
UE_list->next[list_el] = list_el + 1;
UE_list->next_ul[list_el] = list_el + 1;
}
UE_list->next[list_el] = -1;
UE_list->next_ul[list_el] = -1;
}
mac->if_inst = IF_Module_init(i); RC.mac = mac;
UE_list = &mac->UE_list;
UE_list->num_UEs = 0;
UE_list->head = -1;
UE_list->head_ul = -1;
UE_list->avail = 0;
for (list_el = 0; list_el < NUMBER_OF_UE_MAX - 1; list_el++) { AssertFatal(rlc_module_init() == 0,
UE_list->next[list_el] = list_el + 1; "Could not initialize RLC layer\n");
UE_list->next_ul[list_el] = list_el + 1;
}
UE_list->next[list_el] = -1; // These should be out of here later
UE_list->next_ul[list_el] = -1; 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