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

Fixed memory leak for unqueuing uci_inds

Browse Source
This commit is contained in:
Melissa Elkadi
2021-07-05 10:15:26 -07:00
parent 6ddb49d09c
commit 9d644f247c
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+16 -20
View File
@@ -248,11 +248,7 @@ static void copy_dl_tti_req_to_dl_info(nr_downlink_indication_t *dl_info, nfapi_
for (int j = 0; j < num_dcis; j++) for (int j = 0; j < num_dcis; j++)
{ {
nfapi_nr_dl_dci_pdu_t *dci_pdu_list = &pdu_list->pdcch_pdu.pdcch_pdu_rel15.dci_pdu[j]; nfapi_nr_dl_dci_pdu_t *dci_pdu_list = &pdu_list->pdcch_pdu.pdcch_pdu_rel15.dci_pdu[j];
int num_bytes = dci_pdu_list->PayloadSizeBits / 8; int num_bytes = (dci_pdu_list->PayloadSizeBits + 7) / 8;
if (dci_pdu_list->PayloadSizeBits % 8 > 0)
{
num_bytes++;
}
LOG_I(NR_PHY, "[%d, %d] PDCCH DCI (Payload) for rnti %x with PayloadSizeBits %d, num_bytes %d\n", LOG_I(NR_PHY, "[%d, %d] PDCCH DCI (Payload) for rnti %x with PayloadSizeBits %d, num_bytes %d\n",
dl_tti_request->SFN, dl_tti_request->Slot, dci_pdu_list->RNTI, dci_pdu_list->PayloadSizeBits, num_bytes); dl_tti_request->SFN, dl_tti_request->Slot, dci_pdu_list->RNTI, dci_pdu_list->PayloadSizeBits, num_bytes);
for (int k = 0; k < num_bytes; k++) for (int k = 0; k < num_bytes; k++)
@@ -332,11 +328,7 @@ static void copy_ul_dci_data_req_to_dl_info(nr_downlink_indication_t *dl_info, n
for (int j = 0; j < num_dci; j++) for (int j = 0; j < num_dci; j++)
{ {
nfapi_nr_dl_dci_pdu_t *dci_pdu_list = &pdu_list->pdcch_pdu.pdcch_pdu_rel15.dci_pdu[j]; nfapi_nr_dl_dci_pdu_t *dci_pdu_list = &pdu_list->pdcch_pdu.pdcch_pdu_rel15.dci_pdu[j];
int num_bytes = dci_pdu_list->PayloadSizeBits / 8; int num_bytes = (dci_pdu_list->PayloadSizeBits + 7) / 8;
if (dci_pdu_list->PayloadSizeBits % 8 > 0)
{
num_bytes++;
}
LOG_I(NR_PHY, "[%d, %d] ul_dci_req PDCCH DCI for rnti %x with PayloadSizeBits %d and num_bytes %d\n", LOG_I(NR_PHY, "[%d, %d] ul_dci_req PDCCH DCI for rnti %x with PayloadSizeBits %d and num_bytes %d\n",
ul_dci_req->SFN, ul_dci_req->Slot, dci_pdu_list->RNTI, dci_pdu_list->PayloadSizeBits, num_bytes); ul_dci_req->SFN, ul_dci_req->Slot, dci_pdu_list->RNTI, dci_pdu_list->PayloadSizeBits, num_bytes);
for (int k = 0; k < num_bytes; k++) for (int k = 0; k < num_bytes; k++)
@@ -371,19 +363,23 @@ static void copy_ul_tti_data_req_to_dl_info(nr_downlink_indication_t *dl_info, n
if (pdu_list->pdu_type == NFAPI_NR_UL_CONFIG_PUCCH_PDU_TYPE) if (pdu_list->pdu_type == NFAPI_NR_UL_CONFIG_PUCCH_PDU_TYPE)
{ {
nfapi_nr_uci_indication_t *uci_ind = unqueue(&nr_uci_ind_queue); nfapi_nr_uci_indication_t *uci_ind = unqueue(&nr_uci_ind_queue);
if (uci_ind && uci_ind->num_ucis > 0) if (uci_ind)
{ {
uci_ind->sfn = ul_tti_req->SFN; if (uci_ind->num_ucis > 0)
uci_ind->slot = ul_tti_req->Slot; {
LOG_I(NR_MAC, "We have unqueued the previously filled uci_ind and updated the snf/slot to %d/%d.\n", uci_ind->sfn = ul_tti_req->SFN;
uci_ind->sfn, uci_ind->slot); uci_ind->slot = ul_tti_req->Slot;
LOG_I(NR_MAC, "We have unqueued the previously filled uci_ind and updated the snf/slot to %d/%d.\n",
NR_UL_IND_t UL_INFO = { uci_ind->sfn, uci_ind->slot);
.uci_ind = *uci_ind, NR_UL_IND_t UL_INFO = {
}; .uci_ind = *uci_ind,
send_nsa_standalone_msg(&UL_INFO, uci_ind->header.message_id); };
send_nsa_standalone_msg(&UL_INFO, uci_ind->header.message_id);
}
free(uci_ind->uci_list); free(uci_ind->uci_list);
free(uci_ind);
} }
} }
} }