small fix for -w SIMU
This commit is contained in:
+31
-39
@@ -43,10 +43,10 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
|
|||||||
MSC_GEN=0
|
MSC_GEN=0
|
||||||
XFORMS="True"
|
XFORMS="True"
|
||||||
UE_EXPANSION="False"
|
UE_EXPANSION="False"
|
||||||
|
UESIM_EXPANSION="False"
|
||||||
PRINT_STATS="False"
|
PRINT_STATS="False"
|
||||||
VCD_TIMING="False"
|
VCD_TIMING="False"
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
DEADLINE_SCHEDULER_FLAG_USER=""
|
||||||
FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
|
|
||||||
CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
|
CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
|
||||||
REL="Rel15"
|
REL="Rel15"
|
||||||
NR_REL="NR_Rel15"
|
NR_REL="NR_Rel15"
|
||||||
@@ -78,7 +78,7 @@ trap handle_ctrl_c INT
|
|||||||
function print_help() {
|
function print_help() {
|
||||||
echo_info "
|
echo_info "
|
||||||
This program installs OpenAirInterface Software
|
This program installs OpenAirInterface Software
|
||||||
You should have ubuntu 14.xx, updated, and the Linux kernel >= 3.14
|
You should have ubuntu 16.xx or 18.04 updated
|
||||||
Options
|
Options
|
||||||
-h
|
-h
|
||||||
This help
|
This help
|
||||||
@@ -116,7 +116,7 @@ Options
|
|||||||
Rel8 limits the implementation to 3GPP Release 8 version
|
Rel8 limits the implementation to 3GPP Release 8 version
|
||||||
Rel10 limits the implementation to 3GPP Release 10 version
|
Rel10 limits the implementation to 3GPP Release 10 version
|
||||||
-w | --hardware
|
-w | --hardware
|
||||||
EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, ADRV9371_ZC706, None (Default)
|
EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, ADRV9371_ZC706, SIMU, None (Default)
|
||||||
Adds this RF board support (in external packages installation and in compilation)
|
Adds this RF board support (in external packages installation and in compilation)
|
||||||
-t | --transport protocol
|
-t | --transport protocol
|
||||||
ETHERNET , None
|
ETHERNET , None
|
||||||
@@ -175,6 +175,9 @@ Options
|
|||||||
--basic-simulator
|
--basic-simulator
|
||||||
Generates a basic [1 UE + 1 eNB + no channel] simulator.
|
Generates a basic [1 UE + 1 eNB + no channel] simulator.
|
||||||
See targets/ARCH/tcp_bridge/README.tcp_bridge_oai for documentation.
|
See targets/ARCH/tcp_bridge/README.tcp_bridge_oai for documentation.
|
||||||
|
--rfsimulator
|
||||||
|
Generate virtual RF driver
|
||||||
|
to use it, set the environement variable RFSIMULATOR to \"enb\" in the eNB and to the eNB IP address in the UEs
|
||||||
Usage (first build):
|
Usage (first build):
|
||||||
NI/ETTUS B201 + COTS UE : ./build_oai -I --eNB -x --install-system-files -w USRP
|
NI/ETTUS B201 + COTS UE : ./build_oai -I --eNB -x --install-system-files -w USRP
|
||||||
Usage (Regular):
|
Usage (Regular):
|
||||||
@@ -334,13 +337,13 @@ function main() {
|
|||||||
BUILD_DOXYGEN=1
|
BUILD_DOXYGEN=1
|
||||||
echo_info "Will build doxygen support"
|
echo_info "Will build doxygen support"
|
||||||
shift;;
|
shift;;
|
||||||
--disable-deadline)
|
--disable-deadline)
|
||||||
FORCE_DEADLINE_SCHEDULER_FLAG_USER="False"
|
DEADLINE_SCHEDULER_FLAG_USER="False"
|
||||||
echo_info "Disabling the usage of deadline scheduler"
|
echo_info "Disabling the usage of deadline scheduler"
|
||||||
shift 1;;
|
shift 1;;
|
||||||
--enable-deadline)
|
--enable-deadline)
|
||||||
FORCE_DEADLINE_SCHEDULER_FLAG_USER="True"
|
DEADLINE_SCHEDULER_FLAG_USER="True"
|
||||||
echo_info "Enabling the usage of deadline scheduler"
|
echo_info "Enabling the usage of deadline scheduler"
|
||||||
shift 1;;
|
shift 1;;
|
||||||
--enable-cpu-affinity)
|
--enable-cpu-affinity)
|
||||||
CPU_AFFINITY_FLAG_USER="True"
|
CPU_AFFINITY_FLAG_USER="True"
|
||||||
@@ -403,7 +406,11 @@ function main() {
|
|||||||
BASIC_SIMULATOR=1
|
BASIC_SIMULATOR=1
|
||||||
echo_info "Compiling the basic simulator"
|
echo_info "Compiling the basic simulator"
|
||||||
shift 1;;
|
shift 1;;
|
||||||
-h | --help)
|
--rfsimulator)
|
||||||
|
RFSIMULATOR=true
|
||||||
|
echo_info "Compiling the RF simulator"
|
||||||
|
shift 1;;
|
||||||
|
-h | --help)
|
||||||
print_help
|
print_help
|
||||||
exit 1;;
|
exit 1;;
|
||||||
*)
|
*)
|
||||||
@@ -444,33 +451,18 @@ function main() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo_info "RF HW set to $HW"
|
echo_info "RF HW set to $HW"
|
||||||
#Now we set flags to enable deadline scheduler settings
|
# If the user doesn't specify the Linux scheduler to use, we set a value
|
||||||
#By default: USRP: disable,
|
if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
|
||||||
#By default: BLADERF: enable,
|
case "$HW" in
|
||||||
#By default: EXMIMO: enable
|
"EXMIMO")
|
||||||
if [ "$FORCE_DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
|
DEADLINE_SCHEDULER_FLAG_USER="True"
|
||||||
if [ "$HW" = "EXMIMO" ] ; then
|
;;
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="True"
|
*)
|
||||||
elif [ "$HW" = "ETHERNET" ] ; then
|
DEADLINE_SCHEDULER_FLAG_USER="False"
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
;;
|
||||||
elif [ "$HW" = "OAI_USRP" ] ; then
|
esac
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
fi
|
||||||
elif [ "$HW" = "OAI_ADRV9371_ZC706" ] ; then
|
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
|
||||||
elif [ "$HW" = "OAI_BLADERF" ] ; then
|
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
|
||||||
elif [ "$HW" = "OAI_LMSSDR" ] ; then
|
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
|
||||||
elif [ "$HW" = "None" ] ; then
|
|
||||||
DEADLINE_SCHEDULER_FLAG_USER="False"
|
|
||||||
else
|
|
||||||
echo_error "Unknown HW type $HW. Exiting now..."
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
DEADLINE_SCHEDULER_FLAG_USER=$FORCE_DEADLINE_SCHEDULER_FLAG_USER
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Disable CPU Affinity for deadline scheduler
|
#Disable CPU Affinity for deadline scheduler
|
||||||
if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then
|
if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then
|
||||||
|
|||||||
Reference in New Issue
Block a user