From 8a2bb45b256ae2100686fa031ca2943f5a7cc5c3 Mon Sep 17 00:00:00 2001 From: Anta Huang <anta.huang@eurecom.fr> Date: Thu, 17 Mar 2016 20:06:22 +0100 Subject: [PATCH] experimentation framework --- openair2/RRC/LITE/rrc_UE.c | 2 +- openair2/RRC/LITE/rrc_common.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c index c9d9d4f7ce..6bdc98ccf5 100644 --- a/openair2/RRC/LITE/rrc_UE.c +++ b/openair2/RRC/LITE/rrc_UE.c @@ -3654,7 +3654,7 @@ void ue_measurement_report_triggering( const protocol_ctxt_t* const ctxt_pP, con //LOG_D(RRC,"i: %d, j= %d, reportConfigId: %d:Time to trigger for eNB %d is set to %d-index: %d\n",i,j,reportConfigId,ctxt_pP->module_id,ttt_ms,UE_rrc_inst[ctxt_pP->module_id].ReportConfig[i][reportConfigId-1]->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.timeToTrigger); // Freq specific offset of neighbor cell freq if(!((ofn=get_ofn(ctxt_pP->module_id))>=0)) - ofn=2; + ofn=5; //LOG_D(RRC,"OFN for eNB %d is set to %d\n",ctxt_pP->module_id,ofn); //((UE_rrc_inst[ctxt_pP->module_id].MeasObj[i][measObjId-1]->measObject.choice.measObjectEUTRA.offsetFreq != NULL) ? diff --git a/openair2/RRC/LITE/rrc_common.c b/openair2/RRC/LITE/rrc_common.c index 69bcc40ffb..0588782c57 100644 --- a/openair2/RRC/LITE/rrc_common.c +++ b/openair2/RRC/LITE/rrc_common.c @@ -410,12 +410,13 @@ rrc_top_cleanup( for (i=0;i<UE_rrc_inst[module_id].rrc_ue_x2_target_enb_list.size;i++){ x2_target_avg+=x2_target_table[i]; - } - x2_target_avg/=UE_rrc_inst[module_id].rrc_ue_x2_target_enb_list.size; + LOG_I(RRC,"[DST]%lf\n",x2_target_table[i]); + } + x2_target_avg/=UE_rrc_inst[module_id].rrc_ue_x2_target_enb_list.size; LOG_I(RRC,"[DST]%lf;%lf;%lf;%lf;%lf;%lf\n",x2_target_median,x2_target_q1,x2_target_q3,x2_target_min,x2_target_max,x2_target_avg); } - LOG_I(RRC,"[X2]median;q1;q3;min;max;\n"); + /*LOG_I(RRC,"[X2]median;q1;q3;min;max;\n"); for (module_id = 0; module_id < NB_UE_INST; module_id++) { double x2_table[eNB_rrc_inst[module_id].rrc_enb_x2_list.size]; totable(x2_table, &eNB_rrc_inst[module_id].rrc_enb_x2_list); @@ -427,7 +428,7 @@ rrc_top_cleanup( double x2_min = x2_table[0]; // MIN double x2_max = x2_table[eNB_rrc_inst[module_id].rrc_enb_x2_list.size-1]; // mAX LOG_I(RRC,"[X2]%lf;%lf;%lf;%d;%d;\n",x2_median,x2_q1,x2_q3,x2_min,x2_max); - } + }*/ if (NB_UE_INST > 0) { free (UE_rrc_inst); -- GitLab