From 8bec50653f2a3d6971c70e6e381e0b9255190e21 Mon Sep 17 00:00:00 2001
From: Haruki NAOI <naoi.haruki@jp.fujitsu.com>
Date: Fri, 18 May 2018 10:01:07 +0900
Subject: [PATCH] Fix: eNB output core dump file when exiting eNB process.
---
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp | 1 +
targets/RT/USER/lte-softmodem.c | 35 +++++++++++++-------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 6bb7e2e82f..3e58f281b4 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -376,6 +376,7 @@ static void trx_usrp_end(openair0_device *device) {
s->tx_md.end_of_burst = true;
s->tx_stream->send("", 0, s->tx_md);
s->tx_md.end_of_burst = false;
+ sleep(1);
#if defined(USRP_REC_PLAY)
}
#endif
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 5861ba6cb2..a6d1a9af47 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -332,10 +332,14 @@ void exit_fun(const char* s)
if (UE_flag==0) {
for (ru_id=0; ru_id<RC.nb_RU;ru_id++) {
- if (RC.ru[ru_id]->rfdevice.trx_end_func)
- RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
- if (RC.ru[ru_id]->ifdevice.trx_end_func)
- RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
+ if (RC.ru[ru_id]->rfdevice.trx_end_func) {
+ RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
+ RC.ru[ru_id]->rfdevice.trx_end_func = NULL;
+ }
+ if (RC.ru[ru_id]->ifdevice.trx_end_func) {
+ RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
+ RC.ru[ru_id]->ifdevice.trx_end_func = NULL;
+ }
}
}
@@ -346,8 +350,10 @@ void exit_fun(const char* s)
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
if (UE_flag == 0) {
} else {
- if (PHY_vars_UE_g[0][CC_id]->rfdevice.trx_end_func)
- PHY_vars_UE_g[0][CC_id]->rfdevice.trx_end_func(&PHY_vars_UE_g[0][CC_id]->rfdevice);
+ if (PHY_vars_UE_g[0][CC_id]->rfdevice.trx_end_func) {
+ PHY_vars_UE_g[0][CC_id]->rfdevice.trx_end_func(&PHY_vars_UE_g[0][CC_id]->rfdevice);
+ PHY_vars_UE_g[0][CC_id]->rfdevice.trx_end_func = NULL;
+ }
}
}
@@ -1473,16 +1479,21 @@ int main( int argc, char **argv )
// *** Handle per CC_id openair0
if (UE_flag==1) {
- if (PHY_vars_UE_g[0][0]->rfdevice.trx_end_func)
+ if (PHY_vars_UE_g[0][0]->rfdevice.trx_end_func) {
PHY_vars_UE_g[0][0]->rfdevice.trx_end_func(&PHY_vars_UE_g[0][0]->rfdevice);
+ PHY_vars_UE_g[0][0]->rfdevice.trx_end_func = NULL;
+ }
}
else {
for(ru_id=0; ru_id<NB_RU; ru_id++) {
- if (RC.ru[ru_id]->rfdevice.trx_end_func)
- RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
- if (RC.ru[ru_id]->ifdevice.trx_end_func)
- RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
-
+ if (RC.ru[ru_id]->rfdevice.trx_end_func) {
+ RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
+ RC.ru[ru_id]->rfdevice.trx_end_func = NULL;
+ }
+ if (RC.ru[ru_id]->ifdevice.trx_end_func) {
+ RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
+ RC.ru[ru_id]->ifdevice.trx_end_func = NULL;
+ }
}
}
if (ouput_vcd)
--
GitLab