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
canghaiwuhen
OpenXG-RAN
Commits
c5cd47f9
Commit
c5cd47f9
authored
Sep 12, 2018
by
Wang Tsu-Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for not having parallel config inside the config file
parent
d7fd3013
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+13
-3
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
No files found.
openair2/ENB_APP/enb_config.c
View file @
c5cd47f9
...
@@ -2493,10 +2493,20 @@ int RCconfig_parallel(void)
...
@@ -2493,10 +2493,20 @@ int RCconfig_parallel(void)
paramdef_t
ThreadParams
[]
=
THREAD_CONF_DESC
;
paramdef_t
ThreadParams
[]
=
THREAD_CONF_DESC
;
paramlist_def_t
THREADParamList
=
{
THREAD_CONFIG_STRING_THREAD_STRUCT
,
NULL
,
0
};
paramlist_def_t
THREADParamList
=
{
THREAD_CONFIG_STRING_THREAD_STRUCT
,
NULL
,
0
};
config_getlist
(
&
THREADParamList
,
NULL
,
0
,
NULL
);
config_getlist
(
&
THREADParamList
,
ThreadParams
,
sizeof
(
ThreadParams
)
/
sizeof
(
paramdef_t
),
NULL
);
if
(
THREADParamList
.
numelt
>
0
)
parallel_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_PARALLEL_IDX
].
strptr
));
{
worker_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_PARALLEL_IDX
].
strptr
));
config_getlist
(
&
THREADParamList
,
ThreadParams
,
sizeof
(
ThreadParams
)
/
sizeof
(
paramdef_t
),
NULL
);
parallel_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_PARALLEL_IDX
].
strptr
));
worker_conf
=
strdup
(
*
(
THREADParamList
.
paramarray
[
0
][
THREAD_PARALLEL_IDX
].
strptr
));
}
else
{
parallel_conf
=
"PARALLEL_RU_L1_TRX_SPLIT"
;
worker_conf
=
"WORKER_ENABLE"
;
}
if
(
strcmp
(
parallel_conf
,
"PARALLEL_SINGLE_THREAD"
)
==
0
)
set_parallel_conf
(
0
);
if
(
strcmp
(
parallel_conf
,
"PARALLEL_SINGLE_THREAD"
)
==
0
)
set_parallel_conf
(
0
);
else
if
(
strcmp
(
parallel_conf
,
"PARALLEL_RU_L1_SPLIT"
)
==
0
)
set_parallel_conf
(
1
);
else
if
(
strcmp
(
parallel_conf
,
"PARALLEL_RU_L1_SPLIT"
)
==
0
)
set_parallel_conf
(
1
);
...
...
targets/RT/USER/lte-enb.c
View file @
c5cd47f9
...
@@ -1030,7 +1030,7 @@ void kill_eNB_proc(int inst) {
...
@@ -1030,7 +1030,7 @@ void kill_eNB_proc(int inst) {
proc
=
&
eNB
->
proc
;
proc
=
&
eNB
->
proc
;
proc_rxtx
=
&
proc
->
proc_rxtx
[
0
];
proc_rxtx
=
&
proc
->
proc_rxtx
[
0
];
if
(
get_thread_worker_conf
==
WORKER_ENABLE
)
{
if
(
get_thread_worker_conf
()
==
WORKER_ENABLE
)
{
kill_td_thread
(
eNB
);
kill_td_thread
(
eNB
);
kill_te_thread
(
eNB
);
kill_te_thread
(
eNB
);
}
}
...
...
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