Skip to content

O
OpenXG-RAN
Commit 549d1748 authored by heshanyun's avatar heshanyun
Browse files
Options

fix issue about build error of ue

parent 8b71c7b2
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 18 deletions
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @ 549d1748
...@@ -407,11 +407,16 @@ boolean_t pdcp_data_req( ...@@ -407,11 +407,16 @@ boolean_t pdcp_data_req(
break; break;
case RLC_OP_STATUS_OUT_OF_RESSOURCES: case RLC_OP_STATUS_OUT_OF_RESSOURCES:
UE_id = find_UE_id(ctxt_pP->module_id, ctxt_pP->rnti);
if(UE_id != -1){ for (UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock)); if (RC.mac[ctxt_pP->module_id]->UE_info.active[UE_id] == TRUE) {
RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++; if (RC.mac[ctxt_pP->module_id]->UE_info.UE_template[RC.mac[ctxt_pP->module_id]->UE_info.pCC_id[UE_id]][UE_id].rnti == ctxt_pP->rnti) {
pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock)); pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
break;
}
}
} }
LOG_D(PDCP, "Data sending request over RLC failed with 'Out of Resources' reason!\n"); LOG_D(PDCP, "Data sending request over RLC failed with 'Out of Resources' reason!\n");
ret= FALSE; ret= FALSE;
...@@ -471,11 +476,16 @@ boolean_t pdcp_data_req( ...@@ -471,11 +476,16 @@ boolean_t pdcp_data_req(
break; break;
case RLC_OP_STATUS_OUT_OF_RESSOURCES: case RLC_OP_STATUS_OUT_OF_RESSOURCES:
UE_id = find_UE_id(ctxt_pP->module_id, ctxt_pP->rnti);
if(UE_id != -1){ for (UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock)); if (RC.mac[ctxt_pP->module_id]->UE_info.active[UE_id] == TRUE) {
RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++; if (RC.mac[ctxt_pP->module_id]->UE_info.UE_template[RC.mac[ctxt_pP->module_id]->UE_info.pCC_id[UE_id]][UE_id].rnti == ctxt_pP->rnti) {
pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock)); pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
break;
}
}
} }
LOG_D(PDCP, "Data sending request over RLC failed with 'Out of Resources' reason!\n"); LOG_D(PDCP, "Data sending request over RLC failed with 'Out of Resources' reason!\n");
ret= FALSE; ret= FALSE;
......
targets/RT/USER/lte-ru.c
View file @ 549d1748
...@@ -2423,14 +2423,6 @@ void init_RU_proc(RU_t *ru) { ...@@ -2423,14 +2423,6 @@ void init_RU_proc(RU_t *ru) {
if (ru->function!=eNodeB_3GPP) pthread_create( &proc->pthread_ctrl, attr_ctrl, ru_thread_control, (void *)ru ); if (ru->function!=eNodeB_3GPP) pthread_create( &proc->pthread_ctrl, attr_ctrl, ru_thread_control, (void *)ru );
pthread_create( &proc->pthread_FH, attr_FH, ru_thread, (void *)ru ); pthread_create( &proc->pthread_FH, attr_FH, ru_thread, (void *)ru );
#if defined(PRE_SCD_THREAD)
if (NFAPI_MODE == NFAPI_MONOLITHIC) {
int rc;
LOG_I(MAC,"Creating MAC eNB PreSCD Task\n");
rc = itti_create_task (TASK_MAC_ENB_PRE_SCD, pre_scd_task, (void *)ru);
AssertFatal(rc >= 0, "Create task for MAC eNB PreSCD failed\n");
}
#endif
#ifdef PHY_TX_THREAD #ifdef PHY_TX_THREAD
pthread_create( &proc->pthread_phy_tx, NULL, eNB_thread_phy_tx, (void *)ru ); pthread_create( &proc->pthread_phy_tx, NULL, eNB_thread_phy_tx, (void *)ru );
......
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