Skip to content

O
OpenXG-RAN
Commit 2aca1cdb authored by desouza's avatar desouza
Browse files
Options

Merge branch 'develop-nr' into 'nr_pdsch' 

# Conflicts:
#   cmake_targets/CMakeLists.txt
parents 0f8bc0ec 3d845a37
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 195 deletions
ci-scripts/Jenkinsfile-gitlab
View file @ 2aca1cdb
...@@ -313,7 +313,7 @@ pipeline { ...@@ -313,7 +313,7 @@ pipeline {
stage ("Test physical simulators") { stage ("Test physical simulators") {
steps { steps {
gitlabCommitStatus(name: "Test phy-sim") { gitlabCommitStatus(name: "Test phy-sim") {
timeout (time: 30, unit: 'MINUTES') { timeout (time: 45, unit: 'MINUTES') {
sh "./ci-scripts/runTestOnVM.sh --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}" sh "./ci-scripts/runTestOnVM.sh --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
} }
} }
...@@ -328,200 +328,180 @@ pipeline { ...@@ -328,200 +328,180 @@ pipeline {
} }
} }
} }
stage ("Test on CI bench #1") { stage ("Test FDD - Band 7 - B210") {
stages { steps {
stage ("Test FDD - Band 7 - B210") { script {
steps { if ("MERGE".equals(env.gitlabActionType)) {
script { gitlabCommitStatus(name: "Test-FDD-Band7") {
try { build job: 'eNB-CI-FDD-Band7-B210',
if ("MERGE".equals(env.gitlabActionType)) { parameters: [
gitlabCommitStatus(name: "Test-FDD-Band7") { string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
build job: 'eNB-CI-FDD-Band7-B210', string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
parameters: [ string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), booleanParam(name: 'eNB_mergeRequest', value: true)
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)), ]
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)), }
booleanParam(name: 'eNB_mergeRequest', value: true) } else {
] gitlabCommitStatus(name: "Test-FDD-Band7") {
} build job: 'eNB-CI-FDD-Band7-B210',
} else { parameters: [
gitlabCommitStatus(name: "Test-FDD-Band7") { string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
build job: 'eNB-CI-FDD-Band7-B210', string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
parameters: [ string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), booleanParam(name: 'eNB_mergeRequest', value: false)
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)), ]
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
booleanParam(name: 'eNB_mergeRequest', value: false)
]
}
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { }
// In case of any non-success, we are retrieving the HTML report of the last completed }
// slave job. post {
// The only drop-back is that we may retrieve the HTML report of a previous build // In case of any non-success, we are retrieving the HTML report of the last completed
always { // slave job.
script { // The only drop-back is that we may retrieve the HTML report of a previous build
if (!fileExists('test_results-eNB-CI-FDD-Band7-B210.html')) { always {
copyArtifacts(projectName: 'eNB-CI-FDD-Band7-B210', script {
filter: 'test_results*.html', if (!fileExists('test_results-eNB-CI-FDD-Band7-B210.html')) {
selector: lastCompleted()) copyArtifacts(projectName: 'eNB-CI-FDD-Band7-B210',
if (fileExists('test_results-eNB-CI-FDD-Band7-B210.html')) { filter: 'test_results*.html',
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-FDD-Band7-B210.html" selector: lastCompleted())
archiveArtifacts artifacts: 'test_results-eNB-CI-FDD-Band7-B210.html' if (fileExists('test_results-eNB-CI-FDD-Band7-B210.html')) {
} sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-FDD-Band7-B210.html"
} archiveArtifacts artifacts: 'test_results-eNB-CI-FDD-Band7-B210.html'
} }
} }
} }
} }
stage ("Test TDD - Band 40 - B210") { }
steps { }
script { stage ("Test TDD - Band 40 - B210") {
try { steps {
if ("MERGE".equals(env.gitlabActionType)) { script {
gitlabCommitStatus(name: "Test-TDD-Band40") { if ("MERGE".equals(env.gitlabActionType)) {
build job: 'eNB-CI-TDD-Band40-B210', gitlabCommitStatus(name: "Test-TDD-Band40") {
parameters: [ build job: 'eNB-CI-TDD-Band40-B210',
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), parameters: [
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)), string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)), string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
booleanParam(name: 'eNB_mergeRequest', value: true) string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
] booleanParam(name: 'eNB_mergeRequest', value: true)
} ]
} else { }
gitlabCommitStatus(name: "Test-TDD-Band40") { } else {
build job: 'eNB-CI-TDD-Band40-B210', gitlabCommitStatus(name: "Test-TDD-Band40") {
parameters: [ build job: 'eNB-CI-TDD-Band40-B210',
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), parameters: [
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)), string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)), string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
booleanParam(name: 'eNB_mergeRequest', value: false) string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
] booleanParam(name: 'eNB_mergeRequest', value: false)
} ]
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { }
// In case of any non-success, we are retrieving the HTML report of the last completed }
// slave job. post {
// The only drop-back is that we may retrieve the HTML report of a previous build // In case of any non-success, we are retrieving the HTML report of the last completed
always { // slave job.
script { // The only drop-back is that we may retrieve the HTML report of a previous build
if (!fileExists('test_results-eNB-CI-TDD-Band40-B210.html')) { always {
copyArtifacts(projectName: 'eNB-CI-TDD-Band40-B210', script {
filter: 'test_results*.html', if (!fileExists('test_results-eNB-CI-TDD-Band40-B210.html')) {
selector: lastCompleted()) copyArtifacts(projectName: 'eNB-CI-TDD-Band40-B210',
if (fileExists('test_results-eNB-CI-TDD-Band40-B210.html')) { filter: 'test_results*.html',
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-TDD-Band40-B210.html" selector: lastCompleted())
archiveArtifacts artifacts: 'test_results-eNB-CI-TDD-Band40-B210.html' if (fileExists('test_results-eNB-CI-TDD-Band40-B210.html')) {
} sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-TDD-Band40-B210.html"
} archiveArtifacts artifacts: 'test_results-eNB-CI-TDD-Band40-B210.html'
} }
} }
} }
} }
stage ("Test IF4p5 - FDD - Band 7 - B210") { }
steps { }
script { stage ("Test IF4p5 - FDD - Band 7 - B210") {
try { steps {
if ("MERGE".equals(env.gitlabActionType)) { script {
gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") { if ("MERGE".equals(env.gitlabActionType)) {
build job: 'eNB-CI-IF4p5-FDD-Band7-B210', gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
parameters: [ build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), parameters: [
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)), string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)), string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
booleanParam(name: 'eNB_mergeRequest', value: true) string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
] booleanParam(name: 'eNB_mergeRequest', value: true)
} ]
} else { }
gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") { } else {
build job: 'eNB-CI-IF4p5-FDD-Band7-B210', gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
parameters: [ build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), parameters: [
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)), string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)), string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
booleanParam(name: 'eNB_mergeRequest', value: false) string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
] booleanParam(name: 'eNB_mergeRequest', value: false)
} ]
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { }
// In case of any non-success, we are retrieving the HTML report of the last completed }
// slave job. post {
// The only drop-back is that we may retrieve the HTML report of a previous build // In case of any non-success, we are retrieving the HTML report of the last completed
always { // slave job.
script { // The only drop-back is that we may retrieve the HTML report of a previous build
if (!fileExists('test_results-eNB-CI-IF4p5-FDD-Band7-B210.html')) { always {
copyArtifacts(projectName: 'eNB-CI-IF4p5-FDD-Band7-B210', script {
filter: 'test_results*.html', if (!fileExists('test_results-eNB-CI-IF4p5-FDD-Band7-B210.html')) {
selector: lastCompleted()) copyArtifacts(projectName: 'eNB-CI-IF4p5-FDD-Band7-B210',
if (fileExists('test_results-eNB-CI-IF4p5-FDD-Band7-B210.html')) { filter: 'test_results*.html',
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-IF4p5-FDD-Band7-B210.html" selector: lastCompleted())
archiveArtifacts artifacts: 'test_results-eNB-CI-IF4p5-FDD-Band7-B210.html' if (fileExists('test_results-eNB-CI-IF4p5-FDD-Band7-B210.html')) {
} sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-IF4p5-FDD-Band7-B210.html"
} archiveArtifacts artifacts: 'test_results-eNB-CI-IF4p5-FDD-Band7-B210.html'
} }
} }
} }
} }
stage ("Test IF4p5 - TDD - Band 40 - B210") { }
steps { }
script { stage ("Test IF4p5 - TDD - Band 40 - B210") {
try { steps {
if ("MERGE".equals(env.gitlabActionType)) { script {
gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") { if ("MERGE".equals(env.gitlabActionType)) {
build job: 'eNB-CI-IF4p5-TDD-Band40-B210', gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
parameters: [ build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), parameters: [
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)), string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)), string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
booleanParam(name: 'eNB_mergeRequest', value: true) string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
] booleanParam(name: 'eNB_mergeRequest', value: true)
} ]
} else { }
gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") { } else {
build job: 'eNB-CI-IF4p5-TDD-Band40-B210', gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
parameters: [ build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)), parameters: [
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)), string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)), string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
booleanParam(name: 'eNB_mergeRequest', value: false) string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
] booleanParam(name: 'eNB_mergeRequest', value: false)
} ]
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { }
// In case of any non-success, we are retrieving the HTML report of the last completed }
// slave job. post {
// The only drop-back is that we may retrieve the HTML report of a previous build // In case of any non-success, we are retrieving the HTML report of the last completed
always { // slave job.
script { // The only drop-back is that we may retrieve the HTML report of a previous build
if (!fileExists('test_results-eNB-CI-IF4p5-TDD-Band40-B210.html')) { always {
copyArtifacts(projectName: 'eNB-CI-IF4p5-TDD-Band40-B210', script {
filter: 'test_results*.html', if (!fileExists('test_results-eNB-CI-IF4p5-TDD-Band40-B210.html')) {
selector: lastCompleted()) copyArtifacts(projectName: 'eNB-CI-IF4p5-TDD-Band40-B210',
if (fileExists('test_results-eNB-CI-IF4p5-TDD-Band40-B210.html')) { filter: 'test_results*.html',
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-IF4p5-TDD-Band40-B210.html" selector: lastCompleted())
archiveArtifacts artifacts: 'test_results-eNB-CI-IF4p5-TDD-Band40-B210.html' if (fileExists('test_results-eNB-CI-IF4p5-TDD-Band40-B210.html')) {
} sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-IF4p5-TDD-Band40-B210.html"
} archiveArtifacts artifacts: 'test_results-eNB-CI-IF4p5-TDD-Band40-B210.html'
} }
} }
} }
......
ci-scripts/Jenkinsfile-tmp-ran
View file @ 2aca1cdb
...@@ -61,6 +61,7 @@ pipeline { ...@@ -61,6 +61,7 @@ pipeline {
options { options {
disableConcurrentBuilds() disableConcurrentBuilds()
ansiColor('xterm') ansiColor('xterm')
lock (ciSmartPhoneResource)
} }
// the following parameter options are commented out so it shows the ones // the following parameter options are commented out so it shows the ones
// that you SHALL have to run the job. // that you SHALL have to run the job.
...@@ -184,7 +185,6 @@ pipeline { ...@@ -184,7 +185,6 @@ pipeline {
steps { steps {
script { script {
dir ('ci-scripts') { dir ('ci-scripts') {
lock (ciSmartPhoneResource) {
try { try {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m" echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
withCredentials([ withCredentials([
...@@ -197,7 +197,6 @@ pipeline { ...@@ -197,7 +197,6 @@ pipeline {
} catch (Exception e) { } catch (Exception e) {
currentBuild.result = 'FAILURE' currentBuild.result = 'FAILURE'
} }
}
} }
} }
} }
......
cmake_targets/CMakeLists.txt
View file @ 2aca1cdb
...@@ -2556,9 +2556,8 @@ add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c ...@@ -2556,9 +2556,8 @@ add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
${CONFIG_SOURCES}) ${CONFIG_SOURCES})
target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB ${CONFIG_LIBRARIES} -Wl,--end-group m pthread dl rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES}) target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB ${CONFIG_LIBRARIES} -Wl,--end-group m pthread dl rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES})
add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ) add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
target_link_libraries(nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} dl) target_link_libraries(nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim) foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
......
cmake_targets/phy_simulators/CMakeLists.txt
View file @ 2aca1cdb
...@@ -9,5 +9,5 @@ set(MU_RECIEVER False) ...@@ -9,5 +9,5 @@ set(MU_RECIEVER False)
set(NAS_UE False) set(NAS_UE False)
set(MESSAGE_CHART_GENERATOR False) set(MESSAGE_CHART_GENERATOR False)
set(RRC_ASN1_VERSION "Rel14") set(RRC_ASN1_VERSION "Rel14")
set(T_TRACER False) set(T_TRACER True)
include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt) include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @ 2aca1cdb
...@@ -546,7 +546,7 @@ int main(int argc, char **argv) ...@@ -546,7 +546,7 @@ int main(int argc, char **argv)
int c; int c;
int k,i,j,aa; int k,i,j,aa;
int re; int re;
int loglvl=OAILOG_DEBUG; int loglvl=OAILOG_WARNING;
int s,Kr,Kr_bytes; int s,Kr,Kr_bytes;
...@@ -1073,12 +1073,8 @@ int main(int argc, char **argv) ...@@ -1073,12 +1073,8 @@ int main(int argc, char **argv)
AssertFatal(load_configmodule(argc,argv) != NULL, AssertFatal(load_configmodule(argc,argv) != NULL,
"cannot load configuration module, exiting\n"); "cannot load configuration module, exiting\n");
logInit(); logInit();
// enable these lines if you need debug info
set_glog(loglvl); set_glog(loglvl);
// moreover you need to init itti with the following line T_stdout = 1;
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
//itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
if (common_flag == 0) { if (common_flag == 0) {
......
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @ 2aca1cdb
...@@ -497,6 +497,8 @@ int main(int argc, char **argv) { ...@@ -497,6 +497,8 @@ int main(int argc, char **argv) {
AssertFatal(load_configmodule(argc,argv) != NULL, AssertFatal(load_configmodule(argc,argv) != NULL,
"cannot load configuration module, exiting\n"); "cannot load configuration module, exiting\n");
logInit(); logInit();
set_glog(OAILOG_WARNING);
T_stdout = 1;
// enable these lines if you need debug info // enable these lines if you need debug info
// however itti will catch all signals, so ctrl-c won't work anymore // however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt // alternatively you can disable ITTI completely in CMakeLists.txt
......
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @ 2aca1cdb
...@@ -131,16 +131,17 @@ int main(int argc, char **argv) ...@@ -131,16 +131,17 @@ int main(int argc, char **argv)
int ret; int ret;
int run_initial_sync=0; int run_initial_sync=0;
int loglvl=OAILOG_WARNING;
cpuf = get_cpu_freq_GHz(); cpuf = get_cpu_freq_GHz();
if ( load_configmodule(argc,argv) == 0) { if ( load_configmodule(argc,argv) == 0) {
exit_fun("[SOFTMODEM] Error, configuration module init failed\n"); exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
} }
logInit();
randominit(0); randominit(0);
while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:I")) != -1) { while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:IL:")) != -1) {
switch (c) { switch (c) {
case 'f': case 'f':
write_output_file=1; write_output_file=1;
...@@ -296,6 +297,11 @@ int main(int argc, char **argv) ...@@ -296,6 +297,11 @@ int main(int argc, char **argv)
case 'I': case 'I':
run_initial_sync=1; run_initial_sync=1;
break; break;
case 'L':
loglvl = atoi(optarg);
break;
default: default:
case 'h': case 'h':
printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n", printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n",
...@@ -325,6 +331,10 @@ int main(int argc, char **argv) ...@@ -325,6 +331,10 @@ int main(int argc, char **argv)
} }
} }
logInit();
set_glog(loglvl);
T_stdout = 1;
if (snr1set==0) if (snr1set==0)
snr1 = snr0+10; snr1 = snr0+10;
......
targets/RT/USER/nr-ue.c
View file @ 2aca1cdb
...@@ -59,8 +59,13 @@ ...@@ -59,8 +59,13 @@
#include "T.h" #include "T.h"
#ifdef XFORMS
#include "PHY/TOOLS/nr_phy_scope.h" #include "PHY/TOOLS/nr_phy_scope.h"
extern char do_forms;
#endif
extern double cpuf; extern double cpuf;
//static nfapi_nr_config_request_t config_t; //static nfapi_nr_config_request_t config_t;
//static nfapi_nr_config_request_t* config =&config_t; //static nfapi_nr_config_request_t* config =&config_t;
...@@ -589,12 +594,16 @@ static void *UE_thread_synch(void *arg) { ...@@ -589,12 +594,16 @@ static void *UE_thread_synch(void *arg) {
break; break;
} }
extern FD_lte_phy_scope_ue *form_ue[NUMBER_OF_UE_MAX]; #ifdef XFORMS
if (do_forms) {
phy_scope_UE(form_ue[0], extern FD_lte_phy_scope_ue *form_ue[NUMBER_OF_UE_MAX];
PHY_vars_UE_g[0][0],
0,0,7); phy_scope_UE(form_ue[0],
PHY_vars_UE_g[0][0],
0,0,7);
}
#endif
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), ""); AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
// indicate readiness // indicate readiness
UE->proc.instance_cnt_synch--; UE->proc.instance_cnt_synch--;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment