From 75325ec79ea4afaea688c4c82eedf37da76c5092 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sun, 25 Feb 2018 18:23:40 +0100
Subject: [PATCH] debbuging for RU state control
---
targets/RT/USER/lte-ru.c | 6 +++---
targets/SIMU/USER/oaisim.c | 9 +++------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index c87d90884ea..8f74da1cbcb 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -691,7 +691,7 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
pthread_mutex_lock(&proc->mutex_ru);
proc->instance_cnt_ru = -1;
pthread_mutex_unlock(&proc->mutex_ru);
- ru->cmd=EMPTY;
+ ru->cmd=STOP_RU;
return;
}
if ((subframe_select(fp,subframe_tx) == SF_DL) && (symbol_number == 0)) start_meas(&ru->rx_fhaul);
@@ -1839,8 +1839,7 @@ static void* ru_thread( void* param ) {
break;
}
-
- if (ru->fh_south_in && ru->state == RU_RUN) ru->fh_south_in(ru,&frame,&subframe);
+ if (ru->fh_south_in && ru->state == RU_RUN ) ru->fh_south_in(ru,&frame,&subframe);
else AssertFatal(1==0, "No fronthaul interface at south port");
if ((ru->do_prach>0) && (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)==1)) {
@@ -1879,6 +1878,7 @@ static void* ru_thread( void* param ) {
if (ru->fh_north_out) ru->fh_north_out(ru);
+ LOG_I(PHY,"ru->state = %d (RU_RUN is %d)\n",ru->state,RU_RUN);
}
} // while !oai_exit
diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c
index ab694a11ad1..416b212ae1b 100644
--- a/targets/SIMU/USER/oaisim.c
+++ b/targets/SIMU/USER/oaisim.c
@@ -737,19 +737,16 @@ l2l1_task (void *args_p)
CC_id=0;
int all_done=0;
-
while (all_done==0) {
pthread_mutex_lock(&subframe_mutex);
- int subframe_ru_mask_local = ((1<<NB_RU)-1);//subframe_ru_mask;
+ int subframe_ru_mask_local = subframe_ru_mask;//((1<<NB_RU)-1);
int subframe_UE_mask_local = subframe_UE_mask;
pthread_mutex_unlock(&subframe_mutex);
LOG_D(EMU,"Frame %d, Subframe %d, NB_RU %d, NB_UE %d: Checking masks %x,%x\n",frame,sf,NB_RU,NB_UE_INST,subframe_ru_mask_local,subframe_UE_mask_local);
if ((subframe_ru_mask_local == ((1<<NB_RU)-1)) &&
- (subframe_UE_mask_local == ((1<<NB_UE_INST)-1)))
- all_done=1;
- else
- usleep(1500);
+ (subframe_UE_mask_local == ((1<<NB_UE_INST)-1))) all_done=1;
+ else usleep(1500);
}
--
GitLab