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
5a4f6a48
Commit
5a4f6a48
authored
Sep 17, 2019
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix signal 11 issue in RRU side if it is nfapi mode
parent
7af84127
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+7
-2
No files found.
targets/RT/USER/lte-ru.c
View file @
5a4f6a48
...
@@ -1777,6 +1777,7 @@ void *ru_thread( void *param ) {
...
@@ -1777,6 +1777,7 @@ void *ru_thread( void *param ) {
AssertFatal
((
ret
=
pthread_mutex_unlock
(
&
proc
->
mutex_eNBs
))
==
0
,
"mutex_unlock returns %d
\n
"
,
ret
);
AssertFatal
((
ret
=
pthread_mutex_unlock
(
&
proc
->
mutex_eNBs
))
==
0
,
"mutex_unlock returns %d
\n
"
,
ret
);
#if defined(PRE_SCD_THREAD)
#if defined(PRE_SCD_THREAD)
if
(
NFAPI_MODE
==
NFAPI_MONOLITHIC
)
{
new_dlsch_ue_select_tbl_in_use
=
dlsch_ue_select_tbl_in_use
;
new_dlsch_ue_select_tbl_in_use
=
dlsch_ue_select_tbl_in_use
;
dlsch_ue_select_tbl_in_use
=
!
dlsch_ue_select_tbl_in_use
;
dlsch_ue_select_tbl_in_use
=
!
dlsch_ue_select_tbl_in_use
;
memcpy
(
&
pre_scd_eNB_UE_stats
,
&
RC
.
mac
[
ru
->
eNB_list
[
0
]
->
Mod_id
]
->
UE_list
.
eNB_UE_stats
,
sizeof
(
eNB_UE_STATS
)
*
MAX_NUM_CCs
*
NUMBER_OF_UE_MAX
);
memcpy
(
&
pre_scd_eNB_UE_stats
,
&
RC
.
mac
[
ru
->
eNB_list
[
0
]
->
Mod_id
]
->
UE_list
.
eNB_UE_stats
,
sizeof
(
eNB_UE_STATS
)
*
MAX_NUM_CCs
*
NUMBER_OF_UE_MAX
);
...
@@ -1796,7 +1797,7 @@ void *ru_thread( void *param ) {
...
@@ -1796,7 +1797,7 @@ void *ru_thread( void *param ) {
}
}
AssertFatal
((
ret
=
pthread_mutex_unlock
(
&
ru
->
proc
.
mutex_pre_scd
))
==
0
,
"[eNB] error unlocking mutex_pre_scd mutex for eNB pre scd
\n
"
);
AssertFatal
((
ret
=
pthread_mutex_unlock
(
&
ru
->
proc
.
mutex_pre_scd
))
==
0
,
"[eNB] error unlocking mutex_pre_scd mutex for eNB pre scd
\n
"
);
}
#endif
#endif
// wakeup all eNB processes waiting for this RU
// wakeup all eNB processes waiting for this RU
if
(
ru
->
num_eNB
>
0
)
wakeup_L1s
(
ru
);
if
(
ru
->
num_eNB
>
0
)
wakeup_L1s
(
ru
);
...
@@ -2208,11 +2209,13 @@ void init_RU_proc(RU_t *ru) {
...
@@ -2208,11 +2209,13 @@ void init_RU_proc(RU_t *ru) {
pthread_create
(
&
proc
->
pthread_FH
,
attr_FH
,
ru_thread
,
(
void
*
)
ru
);
pthread_create
(
&
proc
->
pthread_FH
,
attr_FH
,
ru_thread
,
(
void
*
)
ru
);
#if defined(PRE_SCD_THREAD)
#if defined(PRE_SCD_THREAD)
if
(
NFAPI_MODE
==
NFAPI_MONOLITHIC
)
{
proc
->
instance_pre_scd
=
-
1
;
proc
->
instance_pre_scd
=
-
1
;
pthread_mutex_init
(
&
proc
->
mutex_pre_scd
,
NULL
);
pthread_mutex_init
(
&
proc
->
mutex_pre_scd
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_pre_scd
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_pre_scd
,
NULL
);
pthread_create
(
&
proc
->
pthread_pre_scd
,
NULL
,
pre_scd_thread
,
(
void
*
)
ru
);
pthread_create
(
&
proc
->
pthread_pre_scd
,
NULL
,
pre_scd_thread
,
(
void
*
)
ru
);
pthread_setname_np
(
proc
->
pthread_pre_scd
,
"pre_scd_thread"
);
pthread_setname_np
(
proc
->
pthread_pre_scd
,
"pre_scd_thread"
);
}
#endif
#endif
#ifdef PHY_TX_THREAD
#ifdef PHY_TX_THREAD
pthread_create
(
&
proc
->
pthread_phy_tx
,
NULL
,
eNB_thread_phy_tx
,
(
void
*
)
ru
);
pthread_create
(
&
proc
->
pthread_phy_tx
,
NULL
,
eNB_thread_phy_tx
,
(
void
*
)
ru
);
...
@@ -2286,6 +2289,7 @@ void kill_RU_proc(RU_t *ru) {
...
@@ -2286,6 +2289,7 @@ void kill_RU_proc(RU_t *ru) {
int
ret
;
int
ret
;
RU_proc_t
*
proc
=
&
ru
->
proc
;
RU_proc_t
*
proc
=
&
ru
->
proc
;
#if defined(PRE_SCD_THREAD)
#if defined(PRE_SCD_THREAD)
if
(
NFAPI_MODE
==
NFAPI_MONOLITHIC
||
NFAPI_MODE
==
NFAPI_MODE_VNF
)
{
AssertFatal
((
ret
=
pthread_mutex_lock
(
&
proc
->
mutex_pre_scd
))
==
0
,
"mutex_lock returns %d
\n
"
,
ret
);
AssertFatal
((
ret
=
pthread_mutex_lock
(
&
proc
->
mutex_pre_scd
))
==
0
,
"mutex_lock returns %d
\n
"
,
ret
);
ru
->
proc
.
instance_pre_scd
=
0
;
ru
->
proc
.
instance_pre_scd
=
0
;
pthread_cond_signal
(
&
proc
->
cond_pre_scd
);
pthread_cond_signal
(
&
proc
->
cond_pre_scd
);
...
@@ -2293,6 +2297,7 @@ void kill_RU_proc(RU_t *ru) {
...
@@ -2293,6 +2297,7 @@ void kill_RU_proc(RU_t *ru) {
pthread_join
(
proc
->
pthread_pre_scd
,
NULL
);
pthread_join
(
proc
->
pthread_pre_scd
,
NULL
);
pthread_mutex_destroy
(
&
proc
->
mutex_pre_scd
);
pthread_mutex_destroy
(
&
proc
->
mutex_pre_scd
);
pthread_cond_destroy
(
&
proc
->
cond_pre_scd
);
pthread_cond_destroy
(
&
proc
->
cond_pre_scd
);
}
#endif
#endif
#ifdef PHY_TX_THREAD
#ifdef PHY_TX_THREAD
AssertFatal
((
ret
=
pthread_mutex_lock
(
&
proc
->
mutex_phy_tx
))
==
0
,
"mutex_lock returns %d
\n
"
,
ret
);
AssertFatal
((
ret
=
pthread_mutex_lock
(
&
proc
->
mutex_phy_tx
))
==
0
,
"mutex_lock returns %d
\n
"
,
ret
);
...
@@ -2698,7 +2703,7 @@ void stop_ru(RU_t *ru) {
...
@@ -2698,7 +2703,7 @@ void stop_ru(RU_t *ru) {
#endif
#endif
printf
(
"Stopping RU %p processing threads
\n
"
,(
void
*
)
ru
);
printf
(
"Stopping RU %p processing threads
\n
"
,(
void
*
)
ru
);
#if defined(PRE_SCD_THREAD)
#if defined(PRE_SCD_THREAD)
if
(
ru
){
if
(
ru
&&
(
NFAPI_MODE
==
NFAPI_MONOLITHIC
||
NFAPI_MODE
==
NFAPI_MODE_VNF
)
){
ru
->
proc
.
instance_pre_scd
=
0
;
ru
->
proc
.
instance_pre_scd
=
0
;
pthread_cond_signal
(
&
ru
->
proc
.
cond_pre_scd
);
pthread_cond_signal
(
&
ru
->
proc
.
cond_pre_scd
);
pthread_join
(
ru
->
proc
.
pthread_pre_scd
,
(
void
**
)
&
status
);
pthread_join
(
ru
->
proc
.
pthread_pre_scd
,
(
void
**
)
&
status
);
...
...
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