Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
16
Merge Requests
16
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
1fc9fd4a
Commit
1fc9fd4a
authored
Sep 21, 2018
by
Wang Tsu-Han
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into parallel-config
parents
2dc3dfa3
7d602d5c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
57 additions
and
21 deletions
+57
-21
ci-scripts/runTestOnVM.sh
ci-scripts/runTestOnVM.sh
+50
-9
ci-scripts/xml_files/enb_usrpb210_band40.xml
ci-scripts/xml_files/enb_usrpb210_band40.xml
+2
-2
openair1/PHY/defs_common.h
openair1/PHY/defs_common.h
+5
-1
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+0
-9
No files found.
ci-scripts/runTestOnVM.sh
View file @
1fc9fd4a
...
...
@@ -89,13 +89,13 @@ function start_basic_sim_enb {
echo
"grep N_RB_DL ci-lte-basic-sim.conf | sed -e 's#N_RB_DL.*=#N_RB_DL =#'"
>>
$1
echo
"echo
\"
cd /home/ubuntu/tmp/cmake_targets/basic_simulator/enb/
\"
"
>>
$1
echo
"cd /home/ubuntu/tmp/cmake_targets/basic_simulator/enb/"
>>
$1
echo
"echo
\"
./lte-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-lte-basic-sim.conf
\"
> ./my-lte-softmodem-run.sh "
>>
$1
echo
"echo
\"
ulimit -c unlimited &&
./lte-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-lte-basic-sim.conf
\"
> ./my-lte-softmodem-run.sh "
>>
$1
echo
"chmod 775 ./my-lte-softmodem-run.sh"
>>
$1
echo
"cat ./my-lte-softmodem-run.sh"
>>
$1
echo
"sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/basic_simulator/enb -o /home/ubuntu/tmp/cmake_targets/log/
$LOC_LOG_FILE
./my-lte-softmodem-run.sh"
>>
$1
ssh
-o
StrictHostKeyChecking
=
no ubuntu@
$LOC_VM_IP_ADDR
<
$1
sleep
6
0
sleep
1
0
rm
$1
}
...
...
@@ -114,7 +114,7 @@ function start_basic_sim_ue {
local
i
=
"0"
echo
"ifconfig oip1 | egrep -c
\"
inet addr
\"
"
>
$1
while
[
$i
-lt
4
0
]
while
[
$i
-lt
1
0
]
do
sleep
5
CONNECTED
=
`
ssh
-o
StrictHostKeyChecking
=
no ubuntu@
$2
<
$1
`
...
...
@@ -237,16 +237,51 @@ function check_iperf {
}
function
terminate_enb_ue_basic_sim
{
echo
"echo
\"
sudo daemon --name=enb_daemon --stop
\"
"
>
$1
echo
"sudo daemon --name=enb_daemon --stop"
>>
$1
echo
"echo
\"
sudo daemon --name=ue_daemon --stop
\"
"
>>
$1
echo
"sudo daemon --name=ue_daemon --stop"
>>
$1
echo
"echo
\"
sudo killall --signal SIGKILL lte-softmodem
\"
"
>>
$1
echo
"sudo killall --signal SIGKILL lte-softmodem"
>>
$1
echo
"NB_OAI_PROCESSES=
\`
ps -aux | grep modem | grep -v grep | grep -c softmodem
\`
"
>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then echo
\"
sudo daemon --name=enb_daemon --stop
\"
; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sudo daemon --name=enb_daemon --stop; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then echo
\"
sudo daemon --name=ue_daemon --stop
\"
; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sudo daemon --name=ue_daemon --stop; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sleep 5; fi"
>>
$1
echo
"echo
\"
ps -aux | grep softmodem
\"
"
>>
$1
echo
"ps -aux | grep softmodem | grep -v grep"
>>
$1
echo
"NB_OAI_PROCESSES=
\`
ps -aux | grep modem | grep -v grep | grep -c softmodem
\`
"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then echo
\"
sudo killall --signal SIGINT lte-softmodem
\"
; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sudo killall --signal SIGINT lte-softmodem; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sleep 5; fi"
>>
$1
echo
"echo
\"
ps -aux | grep softmodem
\"
"
>>
$1
echo
"ps -aux | grep softmodem | grep -v grep"
>>
$1
echo
"NB_OAI_PROCESSES=
\`
ps -aux | grep modem | grep -v grep | grep -c softmodem
\`
"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then echo
\"
sudo killall --signal SIGKILL lte-softmodem
\"
; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sudo killall --signal SIGKILL lte-softmodem; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then echo
\"
sudo killall --signal SIGKILL lte-uesoftmodem
\"
; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sudo killall --signal SIGKILL lte-uesoftmodem; fi"
>>
$1
echo
"if [
\$
NB_OAI_PROCESSES -ne 0 ]; then sleep 5; fi"
>>
$1
echo
"echo
\"
ps -aux | grep softmodem
\"
"
>>
$1
echo
"ps -aux | grep softmodem | grep -v grep"
>>
$1
ssh
-o
StrictHostKeyChecking
=
no ubuntu@
$2
<
$1
rm
-f
$1
}
function
recover_core_dump
{
local
IS_SEG_FAULT
=
`
egrep
-ic
"segmentation fault"
$3
`
if
[
$IS_SEG_FAULT
-ne
0
]
then
local
TC
=
`
echo
$3
|
sed
-e
"s#^.*enb_##"
-e
"s#Hz.*#Hz#"
`
echo
"Segmentation fault detected on enb -> recovering core dump"
echo
"cd /home/ubuntu/tmp/cmake_targets/basic_simulator/enb"
>
$1
echo
"cp /home/ubuntu/tmp/ci-scripts/conf_files/ci-lte-basic-sim.conf ."
>>
$1
echo
"sync"
>>
$1
echo
"sudo tar -cjhf basic-simulator-enb-core-
${
TC
}
.bz2 core lte-softmodem *.so ci-lte-basic-sim.conf my-lte-softmodem-run.sh"
>>
$1
echo
"sudo rm core"
>>
$1
echo
"rm ci-lte-basic-sim.conf"
>>
$1
echo
"sync"
>>
$1
ssh
-o
StrictHostKeyChecking
=
no ubuntu@
$2
<
$1
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/basic_simulator/enb/basic-simulator-enb-core-
${
TC
}
.bz2
$4
rm
-f
$1
fi
}
function
terminate_ltebox_epc
{
echo
"echo
\"
cd /opt/ltebox/tools
\"
"
>
$1
echo
"cd /opt/ltebox/tools"
>>
$1
...
...
@@ -675,6 +710,7 @@ then
terminate_enb_ue_basic_sim
$VM_CMDS
$VM_IP_ADDR
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_UE_LOG_FILE
$ARCHIVES_LOC
recover_core_dump
$VM_CMDS
$VM_IP_ADDR
$ARCHIVES_LOC
/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
terminate_ltebox_epc
$EPC_VM_CMDS
$EPC_VM_IP_ADDR
exit
-1
fi
...
...
@@ -711,6 +747,7 @@ then
terminate_enb_ue_basic_sim
$VM_CMDS
$VM_IP_ADDR
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_UE_LOG_FILE
$ARCHIVES_LOC
recover_core_dump
$VM_CMDS
$VM_IP_ADDR
$ARCHIVES_LOC
/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
echo
"############################################################"
echo
"Starting the eNB at 10MHz"
...
...
@@ -729,6 +766,7 @@ then
terminate_enb_ue_basic_sim
$VM_CMDS
$VM_IP_ADDR
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_UE_LOG_FILE
$ARCHIVES_LOC
recover_core_dump
$VM_CMDS
$VM_IP_ADDR
$ARCHIVES_LOC
/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
terminate_ltebox_epc
$EPC_VM_CMDS
$EPC_VM_IP_ADDR
exit
-1
fi
...
...
@@ -765,6 +803,7 @@ then
terminate_enb_ue_basic_sim
$VM_CMDS
$VM_IP_ADDR
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_UE_LOG_FILE
$ARCHIVES_LOC
recover_core_dump
$VM_CMDS
$VM_IP_ADDR
$ARCHIVES_LOC
/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
echo
"############################################################"
echo
"Starting the eNB at 20MHz"
...
...
@@ -783,6 +822,7 @@ then
terminate_enb_ue_basic_sim
$VM_CMDS
$VM_IP_ADDR
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_UE_LOG_FILE
$ARCHIVES_LOC
recover_core_dump
$VM_CMDS
$VM_IP_ADDR
$ARCHIVES_LOC
/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
terminate_ltebox_epc
$EPC_VM_CMDS
$EPC_VM_IP_ADDR
exit
-1
fi
...
...
@@ -819,6 +859,7 @@ then
terminate_enb_ue_basic_sim
$VM_CMDS
$VM_IP_ADDR
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
$CURRENT_UE_LOG_FILE
$ARCHIVES_LOC
recover_core_dump
$VM_CMDS
$VM_IP_ADDR
$ARCHIVES_LOC
/
$CURRENT_ENB_LOG_FILE
$ARCHIVES_LOC
echo
"############################################################"
echo
"Terminate EPC"
...
...
ci-scripts/xml_files/enb_usrpb210_band40.xml
View file @
1fc9fd4a
...
...
@@ -32,13 +32,13 @@
<testCase
id=
"030104"
>
<class>
Initialize_eNB
</class>
<desc>
Initialize eNB (FDD/Band40/
10
MHz)
</desc>
<desc>
Initialize eNB (FDD/Band40/
5
MHz)
</desc>
<Initialize_eNB_args>
-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --codingw --fepw
</Initialize_eNB_args>
</testCase>
<testCase
id=
"030105"
>
<class>
Initialize_eNB
</class>
<desc>
Initialize eNB (TDD/Band40/
5
MHz/info)
</desc>
<desc>
Initialize eNB (TDD/Band40/
10
MHz/info)
</desc>
<Initialize_eNB_args>
-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf --codingw --fepw
</Initialize_eNB_args>
</testCase>
...
...
openair1/PHY/defs_common.h
View file @
1fc9fd4a
...
...
@@ -1006,7 +1006,11 @@ static inline void wait_sync(char *thread_name) {
pthread_mutex_unlock
(
&
sync_mutex
);
printf
(
"got sync (%s)
\n
"
,
thread_name
);
/*
* Raphael Defosseux: added for CI to get faster the got sync message.
*/
fflush
(
stdout
);
fflush
(
stderr
);
}
static
inline
int
wakeup_thread
(
pthread_mutex_t
*
mutex
,
pthread_cond_t
*
cond
,
int
*
instance_cnt
,
char
*
name
)
{
...
...
targets/RT/USER/lte-softmodem.c
View file @
1fc9fd4a
...
...
@@ -891,16 +891,7 @@ static void wait_nfapi_init(char *thread_name) {
pthread_mutex_unlock
(
&
nfapi_sync_mutex
);
/*
* Raphael Defosseux: temporary workaround for CI
* -- Repeating the message thrice to make sure
* -- it is present during flush.
*/
printf
(
"NFAPI: got sync (%s)
\n
"
,
thread_name
);
printf
(
"NFAPI: got sync (%s)
\n
"
,
thread_name
);
printf
(
"NFAPI: got sync (%s)
\n
"
,
thread_name
);
fflush
(
stdout
);
fflush
(
stderr
);
}
int
main
(
int
argc
,
char
**
argv
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment