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
wangjie
OpenXG-RAN
Commits
874cefb9
Commit
874cefb9
authored
Mar 18, 2021
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build errors
Also added warning messages for gNB number of threads required
parent
a702fd55
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
0 deletions
+41
-0
executables/nr-gnb.c
executables/nr-gnb.c
+2
-0
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+16
-0
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+12
-0
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+11
-0
No files found.
executables/nr-gnb.c
View file @
874cefb9
...
@@ -346,7 +346,9 @@ void init_gNB_Tpool(int inst) {
...
@@ -346,7 +346,9 @@ void init_gNB_Tpool(int inst) {
// ULSCH decoding threadpool
// ULSCH decoding threadpool
gNB
->
threadPool
=
(
tpool_t
*
)
malloc
(
sizeof
(
tpool_t
));
gNB
->
threadPool
=
(
tpool_t
*
)
malloc
(
sizeof
(
tpool_t
));
int
numCPU
=
sysconf
(
_SC_NPROCESSORS_ONLN
);
int
numCPU
=
sysconf
(
_SC_NPROCESSORS_ONLN
);
LOG_I
(
PHY
,
"Number of threads requested in config file: %d, Number of threads available on this machine: %d
\n
"
,
gNB
->
pusch_proc_threads
,
numCPU
);
int
threadCnt
=
min
(
numCPU
,
gNB
->
pusch_proc_threads
);
int
threadCnt
=
min
(
numCPU
,
gNB
->
pusch_proc_threads
);
if
(
threadCnt
<
2
)
LOG_E
(
PHY
,
"Number of threads for gNB should be more than 1. Allocated only %d
\n
"
,
threadCnt
);
char
ul_pool
[
80
];
char
ul_pool
[
80
];
sprintf
(
ul_pool
,
"-1"
);
sprintf
(
ul_pool
,
"-1"
);
int
s_offset
=
0
;
int
s_offset
=
0
;
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
874cefb9
...
@@ -252,6 +252,17 @@ void nr_dlsim_preprocessor(module_id_t module_id,
...
@@ -252,6 +252,17 @@ void nr_dlsim_preprocessor(module_id_t module_id,
sched_ctrl
->
numDmrsCdmGrpsNoData
=
1
;
sched_ctrl
->
numDmrsCdmGrpsNoData
=
1
;
}
}
typedef
struct
{
uint64_t
optmask
;
//mask to store boolean config options
uint8_t
nr_dlsch_parallel
;
// number of threads for dlsch decoding, 0 means no parallelization
tpool_t
Tpool
;
// thread pool
}
nrUE_params_t
;
nrUE_params_t
nrUE_params
;
nrUE_params_t
*
get_nrUE_params
(
void
)
{
return
&
nrUE_params
;
}
int
main
(
int
argc
,
char
**
argv
)
int
main
(
int
argc
,
char
**
argv
)
{
{
...
@@ -841,6 +852,11 @@ int main(int argc, char **argv)
...
@@ -841,6 +852,11 @@ int main(int argc, char **argv)
unsigned
int
errors_bit
=
0
;
unsigned
int
errors_bit
=
0
;
uint32_t
errors_scrambling
=
0
;
uint32_t
errors_scrambling
=
0
;
initTpool
(
"N"
,
&
(
nrUE_params
.
Tpool
),
false
);
notifiedFIFO_t
txFifo
;
UE
->
txFifo
=
&
txFifo
;
initNotifiedFIFO
(
&
txFifo
);
pushNotifiedFIFO
(
&
txFifo
,
newNotifiedFIFO_elt
(
sizeof
(
nr_rxtx_thread_data_t
),
0
,
&
txFifo
,
NULL
));
test_input_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
test_input_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
estimated_output_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
estimated_output_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
...
...
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
874cefb9
...
@@ -159,6 +159,18 @@ int nr_derive_key(int alg_type, uint8_t alg_id,
...
@@ -159,6 +159,18 @@ int nr_derive_key(int alg_type, uint8_t alg_id,
return
0
;
return
0
;
}
}
typedef
struct
{
uint64_t
optmask
;
//mask to store boolean config options
uint8_t
nr_dlsch_parallel
;
// number of threads for dlsch decoding, 0 means no parallelization
tpool_t
Tpool
;
// thread pool
}
nrUE_params_t
;
nrUE_params_t
nrUE_params
;
nrUE_params_t
*
get_nrUE_params
(
void
)
{
return
&
nrUE_params
;
}
int
main
(
int
argc
,
char
**
argv
){
int
main
(
int
argc
,
char
**
argv
){
char
c
;
char
c
;
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
874cefb9
...
@@ -183,6 +183,17 @@ int nr_derive_key(int alg_type, uint8_t alg_id,
...
@@ -183,6 +183,17 @@ int nr_derive_key(int alg_type, uint8_t alg_id,
return
0
;
return
0
;
}
}
typedef
struct
{
uint64_t
optmask
;
//mask to store boolean config options
uint8_t
nr_dlsch_parallel
;
// number of threads for dlsch decoding, 0 means no parallelization
tpool_t
Tpool
;
// thread pool
}
nrUE_params_t
;
nrUE_params_t
nrUE_params
;
nrUE_params_t
*
get_nrUE_params
(
void
)
{
return
&
nrUE_params
;
}
// needed for some functions
// needed for some functions
uint16_t
n_rnti
=
0x1234
;
uint16_t
n_rnti
=
0x1234
;
openair0_config_t
openair0_cfg
[
MAX_CARDS
];
openair0_config_t
openair0_cfg
[
MAX_CARDS
];
...
...
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