Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常顺宇
OpenXG-RAN
Commits
255d3238
Commit
255d3238
authored
5 years ago
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
real time ok in monolithic cases, phy test tools fixed
parent
10b046f5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
6 deletions
+27
-6
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+3
-1
common/utils/threadPool/thread-pool.h
common/utils/threadPool/thread-pool.h
+3
-3
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
+1
-0
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+4
-0
openair1/SIMULATION/LTE_PHY/ulsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
+4
-0
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+12
-2
No files found.
cmake_targets/CMakeLists.txt
View file @
255d3238
...
...
@@ -186,7 +186,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CU
# these changes are related to hardcoded path to include .h files
set
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS
}
-g3 -DMALLOC_CHECK_=3"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
-g3 -DMALLOC_CHECK_=3 -Og"
)
set
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS
}
-O
g
"
)
set
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS
}
-O
3
"
)
set
(
GIT_BRANCH
"UNKNOWN"
)
set
(
GIT_COMMIT_HASH
"UNKNOWN"
)
...
...
@@ -2449,6 +2449,7 @@ add_executable(lte-softmodem
${
OPENAIR_TARGETS
}
/RT/USER/ru_control.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem-common.c
${
OPENAIR_DIR
}
/common/utils/threadPool/thread-pool.c
${
OPENAIR2_DIR
}
/ENB_APP/NB_IoT_interface.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks.c
...
...
@@ -2828,6 +2829,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
add_executable
(
${
myExe
}
${
OPENAIR1_DIR
}
/SIMULATION/LTE_PHY/
${
myExe
}
.c
${
OPENAIR_DIR
}
/common/utils/threadPool/thread-pool.c
${
OPENAIR_DIR
}
/common/utils/backtrace.c
${
OPENAIR_DIR
}
/common/utils/system.c
${
XFORMS_SOURCE
}
...
...
This diff is collapsed.
Click to expand it.
common/utils/threadPool/thread-pool.h
View file @
255d3238
...
...
@@ -217,11 +217,11 @@ static inline void pushTpool(tpool_t *t, notifiedFIFO_elt_t *msg) {
static
inline
notifiedFIFO_elt_t
*
pullTpool
(
notifiedFIFO_t
*
responseFifo
,
tpool_t
*
t
)
{
notifiedFIFO_elt_t
*
msg
=
pullNotifiedFIFO
(
responseFifo
);
AssertFatal
(
t
->
traceFd
,
"Thread pool used while not initialized"
);
if
(
t
->
measurePerf
)
msg
->
returnTime
=
rdtsc
();
if
(
t
->
traceFd
>
=
0
)
if
(
t
->
traceFd
>
0
)
if
(
write
(
t
->
traceFd
,
msg
,
sizeof
(
*
msg
)));
return
msg
;
...
...
@@ -229,7 +229,7 @@ static inline notifiedFIFO_elt_t *pullTpool(notifiedFIFO_t *responseFifo, tpool_
static
inline
notifiedFIFO_elt_t
*
tryPullTpool
(
notifiedFIFO_t
*
responseFifo
,
tpool_t
*
t
)
{
notifiedFIFO_elt_t
*
msg
=
pollNotifiedFIFO
(
responseFifo
);
AssertFatal
(
t
->
traceFd
,
"Thread pool used while not initialized"
);
if
(
msg
==
NULL
)
return
NULL
;
...
...
This diff is collapsed.
Click to expand it.
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
View file @
255d3238
...
...
@@ -11,6 +11,7 @@
#include "stddef.h"
#include "nfapi_interface.h"
#include <nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h>
#define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
#define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
255d3238
...
...
@@ -1266,6 +1266,10 @@ int main(int argc, char **argv) {
}
L1_rxtx_proc_t
*
proc_eNB
=
&
eNB
->
proc
.
L1_proc
;
initTpool
(
"n"
,
&
proc_eNB
->
threadPool
,
true
);
initNotifiedFIFO
(
&
proc_eNB
->
respEncode
);
initNotifiedFIFO
(
&
proc_eNB
->
respDecode
);
proc_eNB
->
frame_tx
=
0
;
if
(
input_fd
==
NULL
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @
255d3238
...
...
@@ -793,6 +793,10 @@ int main(int argc, char **argv) {
proc_rxtx_ue
->
frame_rx
=
(
subframe
<
4
)
?
(
proc_rxtx
->
frame_tx
-
1
)
:
(
proc_rxtx
->
frame_tx
);
proc_rxtx_ue
->
subframe_tx
=
proc_rxtx
->
subframe_rx
;
proc_rxtx_ue
->
subframe_rx
=
(
proc_rxtx
->
subframe_tx
+
6
)
%
10
;
initTpool
(
"n"
,
&
proc_rxtx
->
threadPool
,
true
);
initNotifiedFIFO
(
&
proc_rxtx
->
respEncode
);
initNotifiedFIFO
(
&
proc_rxtx
->
respDecode
);
printf
(
"Init UL hopping UE
\n
"
);
init_ul_hopping
(
&
UE
->
frame_parms
);
printf
(
"Init UL hopping eNB
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.c
View file @
255d3238
...
...
@@ -665,9 +665,19 @@ int main ( int argc, char **argv )
if
(
RC
.
nb_L1_inst
>
0
)
{
printf
(
"Initializing eNB threads single_thread_flag:%d wait_for_sync:%d
\n
"
,
get_softmodem_params
()
->
single_thread_flag
,
get_softmodem_params
()
->
wait_for_sync
);
init_eNB
(
get_softmodem_params
()
->
single_thread_flag
,
get_softmodem_params
()
->
wait_for_sync
);
// for (inst=0;inst<RC.nb_L1_inst;inst++)
// for (CC_id=0;CC_id<RC.nb_L1_CC[inst];CC_id++) phy_init_lte_eNB(RC.eNB[inst][CC_id],0,0);
}
for
(
int
x
=
0
;
x
<
RC
.
nb_L1_inst
;
x
++
)
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_L1_CC
[
x
];
CC_id
++
)
{
L1_rxtx_proc_t
*
L1proc
=
&
RC
.
eNB
[
x
][
CC_id
]
->
proc
.
L1_proc
;
if
(
strlen
(
get_softmodem_params
()
->
threadPoolConfig
)
>
0
)
initTpool
(
get_softmodem_params
()
->
threadPoolConfig
,
&
L1proc
->
threadPool
,
true
);
else
initTpool
(
"n"
,
&
L1proc
->
threadPool
,
true
);
initNotifiedFIFO
(
&
L1proc
->
respEncode
);
initNotifiedFIFO
(
&
L1proc
->
respDecode
);
}
}
printf
(
"wait_eNBs()
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
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