From 103b751fb118dd60286577d6b3c5bb91f690990d Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Fri, 27 Feb 2015 10:00:54 +0000
Subject: [PATCH] adding a few error messages
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6628 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c | 2 +-
.../PHY/LTE_TRANSPORT/dlsch_demodulation.c | 3 +--
openair1/SCHED/phy_procedures_lte_ue.c | 18 ++++++++----------
openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 6 +++---
openair2/PHY_INTERFACE/mac_phy_primitives.c | 2 +-
openair2/RRC/LITE/L2_interface.c | 2 +-
6 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
index 0324b1b736..0311eac91a 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
@@ -631,7 +631,7 @@ uint32_t dlsch_decoding_emul(PHY_VARS_UE *phy_vars_ue,
}
if (eNB_id2==NB_eNB_INST) {
LOG_E(PHY,"FATAL : Could not find attached eNB for DLSCH emulation !!!!\n");
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("Could not find attached eNB for DLSCH emulation");
}
LOG_D(PHY,"[UE] dlsch_decoding_emul : subframe %d, eNB_id %d, dlsch_id %d\n",subframe,eNB_id2,dlsch_id);
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
index e5bad6d49d..2dd9318cc9 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -118,8 +118,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
break;
default:
- //msg("[PHY][UE %d][FATAL] Frame %d subframe %d: Unknown PDSCH format %d\n",phy_vars_ue->frame,subframe,type);
- mac_xface->macphy_exit("");
+ LOG_E(PHY,"[UE %d][FATAL] Frame %d subframe %d: Unknown PDSCH format %d\n",phy_vars_ue->frame_rx,subframe,type);
return(-1);
break;
}
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index 95b0a5f444..b799c7e62f 100755
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -284,7 +284,6 @@ void ra_failed(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index) {
PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PRACH;
LOG_E(PHY,"[UE %d] Frame %d Random-access procedure fails, going back to PRACH, setting SIStatus = 0 and State RRC_IDLE\n",Mod_id,PHY_vars_UE_g[Mod_id][CC_id]->frame_rx);
//mac_xface->macphy_exit("");
- // exit(-1);
}
void ra_succeeded(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index) {
@@ -689,7 +688,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
if (harq_pid==255) {
LOG_E(PHY,"[UE%d] Frame %d ulsch_decoding.c: FATAL ERROR: illegal harq_pid, returning\n",
Mod_id,frame_tx);
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("Error in ulsch_decoding");
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX, VCD_FUNCTION_OUT);
stop_meas(&phy_vars_ue->phy_proc_tx);
return;
@@ -786,7 +785,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
eNB_id,
phy_vars_ue->transmission_mode[eNB_id],0,0)!=0) {
LOG_E(PHY,"ulsch_coding.c: FATAL ERROR: returning\n");
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("Error in ulsch_coding");
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX, VCD_FUNCTION_OUT);
stop_meas(&phy_vars_ue->phy_proc_tx);
return;
@@ -1641,8 +1640,8 @@ void restart_phy(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstraction_fla
// uint8_t last_slot;
uint8_t i;
- LOG_D(PHY,"[UE %d] frame %d, slot %d, restarting PHY!\n",phy_vars_ue->Mod_id,phy_vars_ue->frame_rx,phy_vars_ue->slot_rx);
- mac_xface->macphy_exit("");
+ LOG_I(PHY,"[UE %d] frame %d, slot %d, restarting PHY!\n",phy_vars_ue->Mod_id,phy_vars_ue->frame_rx,phy_vars_ue->slot_rx);
+ mac_xface->macphy_exit("restart_phy called");
// first_run = 1;
if (abstraction_flag ==0 ) {
@@ -1848,7 +1847,7 @@ void lte_ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *phy_vars_ue,uint8_t abst
#else
if (phy_vars_ue->lte_ue_pbch_vars[eNB_id]->pdu_errors_conseq>=100) {
LOG_E(PHY,"More that 100 consecutive PBCH errors! Exiting!\n");
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("More that 100 consecutive PBCH errors!");
}
#endif
}
@@ -2734,7 +2733,6 @@ int lte_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *phy_vars_ue,uint8_t abst
#endif
//dump_dlsch_SI(phy_vars_ue,eNB_id,subframe_prev);
- //exit(-1);
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX, VCD_FUNCTION_OUT);
stop_meas(&phy_vars_ue->phy_proc_rx);
return(-1);
@@ -2809,7 +2807,7 @@ int lte_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *phy_vars_ue,uint8_t abst
phy_vars_ue->dlsch_ue_ra[eNB_id]->rnti = phy_vars_ue->prach_resources[eNB_id]->ra_RNTI;
else {
LOG_E(PHY,"[UE %d] Frame %d, subframe %d: FATAL, prach_resources is NULL\n",phy_vars_ue->Mod_id,frame_rx,subframe_prev);
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("prach_resources is NULL");
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX, VCD_FUNCTION_OUT);
stop_meas(&phy_vars_ue->phy_proc_rx);
return 0;
@@ -3225,7 +3223,8 @@ int lte_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *phy_vars_ue,uint8_t abst
}
LOG_T(PHY,"\n");
#endif
- if (subframe_rx==9) exit(-1);
+ if (subframe_rx==9)
+ mac_xface->macphy_exit("Why are we exiting here?");
}
else {
#ifdef Rel10
@@ -3654,7 +3653,6 @@ void phy_UE_lte_check_measurement_thresholds(instance_t instanceP, ral_threshold
frame_rx,subframe_tx);
phy_vars_ue->UE_mode[eNB_id] = RESYNCH;
// mac_xface->macphy_exit("Connection lost");
- //exit(-1);
} else if (ret == PHY_HO_PRACH) {
LOG_I(PHY,"[UE %d] Frame %d, subframe %d, return to PRACH and perform a contention-free access\n",
phy_vars_ue->Mod_id,frame_rx,subframe_tx);
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index bca6a85ecb..c2c880fe5f 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -130,7 +130,7 @@ rnti_t UE_RNTI(module_id_t mod_idP, int ue_idP) {
if (rnti>0)
return (rnti);
LOG_E(MAC,"[eNB %d] Couldn't find RNTI for UE %d\n",mod_idP,ue_idP);
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("UE_RNTI: Couldn't find RNTI for UE");
return(0);
}
@@ -317,7 +317,7 @@ int mac_remove_ue(module_id_t mod_idP, int ue_idP, int frameP) {
LOG_E(MAC,"error in mac_remove_ue(), could not find previous to %d in UE_list, should never happen, Dumping UE list\n",ue_idP);
dump_ue_list(UE_list,0);
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("mac_remove_ue: Problem in UE_list");
return(-1);
}
@@ -363,7 +363,7 @@ void swap_UEs(UE_list_t *listP,int nodeiP, int nodejP, int ul_flag) {
prev_i = prev(listP,nodeiP,ul_flag);
prev_j = prev(listP,nodejP,ul_flag);
if ((prev_i<0) || (prev_j<0)) {
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("swap_UEs: problem");
return; // not reached
}
diff --git a/openair2/PHY_INTERFACE/mac_phy_primitives.c b/openair2/PHY_INTERFACE/mac_phy_primitives.c
index 2522162e16..70bd07367e 100644
--- a/openair2/PHY_INTERFACE/mac_phy_primitives.c
+++ b/openair2/PHY_INTERFACE/mac_phy_primitives.c
@@ -180,7 +180,7 @@ MACPHY_DATA_REQ *new_macphy_data_req(unsigned char Mod_id) {
msg("[OPENAIR][MAC][ERROR] frame %d: No more DATA_REQ !!!!\n",mac_xface->frame);
print_active_requests(Mod_id);
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("new_macphy_data_req: no more DATA_REQ");
//rt_sleep(nano2count(2000));
return((MACPHY_DATA_REQ*)0);
diff --git a/openair2/RRC/LITE/L2_interface.c b/openair2/RRC/LITE/L2_interface.c
index f8348eb4ce..809ca0f5af 100644
--- a/openair2/RRC/LITE/L2_interface.c
+++ b/openair2/RRC/LITE/L2_interface.c
@@ -83,7 +83,7 @@ int8_t mac_rrc_lite_data_req(module_id_t Mod_idP, frame_t frameP, uint16_t Srb_i
// All even frames transmit SIB in SF 5
if (eNB_rrc_inst[Mod_idP].sizeof_SIB1 == 255) {
LOG_E(RRC,"[eNB %d] MAC Request for SIB1 and SIB1 not initialized\n",Mod_idP);
- mac_xface->macphy_exit("");
+ mac_xface->macphy_exit("mac_rrc_lite_data_req: MAC Request for SIB1 and SIB1 not initialized");
}
if ((frameP%2) == 0) {
memcpy(&buffer_pP[0],eNB_rrc_inst[Mod_idP].SIB1,eNB_rrc_inst[Mod_idP].sizeof_SIB1);
--
GitLab