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
d1f7346c
Commit
d1f7346c
authored
Jan 05, 2018
by
Eurecom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix for missing wait sync
parent
cabb4561
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
1 deletion
+21
-1
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+9
-0
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+1
-0
openair1/SCHED/ru_procedures.c
openair1/SCHED/ru_procedures.c
+2
-1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+6
-0
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+3
-0
No files found.
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
View file @
d1f7346c
...
@@ -560,6 +560,9 @@ void *te_thread(void *param) {
...
@@ -560,6 +560,9 @@ void *te_thread(void *param) {
PHY_VARS_eNB
*
eNB
=
((
te_params
*
)
param
)
->
eNB
;
PHY_VARS_eNB
*
eNB
=
((
te_params
*
)
param
)
->
eNB
;
eNB_proc_t
*
proc
=
&
eNB
->
proc
;
eNB_proc_t
*
proc
=
&
eNB
->
proc
;
wait_sync
(
"te_thread"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
if
(
wait_on_condition
(
&
proc
->
mutex_te
[
0
],
&
proc
->
cond_te
[
0
],
&
proc
->
instance_cnt_te
[
0
],
"te thread"
)
<
0
)
break
;
if
(
wait_on_condition
(
&
proc
->
mutex_te
[
0
],
&
proc
->
cond_te
[
0
],
&
proc
->
instance_cnt_te
[
0
],
"te thread"
)
<
0
)
break
;
...
@@ -597,6 +600,9 @@ void *te_thread1(void *param) {
...
@@ -597,6 +600,9 @@ void *te_thread1(void *param) {
PHY_VARS_eNB
*
eNB
=
((
te_params
*
)
param
)
->
eNB
;
PHY_VARS_eNB
*
eNB
=
((
te_params
*
)
param
)
->
eNB
;
eNB_proc_t
*
proc
=
&
eNB
->
proc
;
eNB_proc_t
*
proc
=
&
eNB
->
proc
;
wait_sync
(
"te_thread1"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
@@ -635,6 +641,9 @@ void *te_thread2(void *param) {
...
@@ -635,6 +641,9 @@ void *te_thread2(void *param) {
PHY_VARS_eNB
*
eNB
=
((
te_params
*
)
param
)
->
eNB
;
PHY_VARS_eNB
*
eNB
=
((
te_params
*
)
param
)
->
eNB
;
eNB_proc_t
*
proc
=
&
eNB
->
proc
;
eNB_proc_t
*
proc
=
&
eNB
->
proc
;
wait_sync
(
"te_thread2"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
...
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
View file @
d1f7346c
...
@@ -420,6 +420,7 @@ void *td_thread(void *param) {
...
@@ -420,6 +420,7 @@ void *td_thread(void *param) {
thread_top_init
(
"td_thread"
,
1
,
200000
,
250000
,
500000
);
thread_top_init
(
"td_thread"
,
1
,
200000
,
250000
,
500000
);
pthread_setname_np
(
pthread_self
(),
"td processing"
);
pthread_setname_np
(
pthread_self
(),
"td processing"
);
LOG_I
(
PHY
,
"thread td created id=%ld
\n
"
,
syscall
(
__NR_gettid
));
LOG_I
(
PHY
,
"thread td created id=%ld
\n
"
,
syscall
(
__NR_gettid
));
wait_sync
(
"td_thread"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
...
openair1/SCHED/ru_procedures.c
View file @
d1f7346c
...
@@ -148,7 +148,7 @@ static void *feptx_thread(void *param) {
...
@@ -148,7 +148,7 @@ static void *feptx_thread(void *param) {
LOG_I
(
PHY
,
"thread feptx created id=%ld
\n
"
,
syscall
(
__NR_gettid
));
LOG_I
(
PHY
,
"thread feptx created id=%ld
\n
"
,
syscall
(
__NR_gettid
));
//CPU_SET(6, &cpuset);
//CPU_SET(6, &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
wait_sync
(
"feptx_thread"
);
...
@@ -445,6 +445,7 @@ static void *fep_thread(void *param) {
...
@@ -445,6 +445,7 @@ static void *fep_thread(void *param) {
CPU_ZERO
(
&
cpuset
);
CPU_ZERO
(
&
cpuset
);
//CPU_SET(2, &cpuset);
//CPU_SET(2, &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
wait_sync
(
"fep_thread"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
...
targets/RT/USER/lte-enb.c
View file @
d1f7346c
...
@@ -207,6 +207,8 @@ static void* tx_thread(void* param) {
...
@@ -207,6 +207,8 @@ static void* tx_thread(void* param) {
sprintf
(
thread_name
,
"TXnp4_%d
\n
"
,
&
eNB
->
proc
.
proc_rxtx
[
0
]
==
proc
?
0
:
1
);
sprintf
(
thread_name
,
"TXnp4_%d
\n
"
,
&
eNB
->
proc
.
proc_rxtx
[
0
]
==
proc
?
0
:
1
);
thread_top_init
(
thread_name
,
1
,
470000
,
500000
,
500000
);
thread_top_init
(
thread_name
,
1
,
470000
,
500000
,
500000
);
wait_sync
(
"tx_thread"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
if
(
wait_on_condition
(
&
proc
->
mutex_rxtx
,
&
proc
->
cond_rxtx
,
&
proc
->
instance_cnt_rxtx
,
thread_name
)
<
0
)
break
;
if
(
wait_on_condition
(
&
proc
->
mutex_rxtx
,
&
proc
->
cond_rxtx
,
&
proc
->
instance_cnt_rxtx
,
thread_name
)
<
0
)
break
;
...
@@ -265,6 +267,8 @@ static void* eNB_thread_rxtx( void* param ) {
...
@@ -265,6 +267,8 @@ static void* eNB_thread_rxtx( void* param ) {
//CPU_SET(3, &cpuset);
//CPU_SET(3, &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
wait_sync
(
"eNB_thread_rxtx"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RXTX0
+
(
proc
->
subframe_rx
&
1
),
0
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RXTX0
+
(
proc
->
subframe_rx
&
1
),
0
);
...
@@ -625,6 +629,7 @@ static void* eNB_thread_prach( void* param ) {
...
@@ -625,6 +629,7 @@ static void* eNB_thread_prach( void* param ) {
thread_top_init
(
"eNB_thread_prach"
,
1
,
500000
,
1000000
,
20000000
);
thread_top_init
(
"eNB_thread_prach"
,
1
,
500000
,
1000000
,
20000000
);
wait_sync
(
"eNB_thread_prach"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
@@ -743,6 +748,7 @@ void init_eNB_proc(int inst) {
...
@@ -743,6 +748,7 @@ void init_eNB_proc(int inst) {
proc_rxtx
[
1
].
instance_cnt_rxtx
=
-
1
;
proc_rxtx
[
1
].
instance_cnt_rxtx
=
-
1
;
proc
->
instance_cnt_prach
=
-
1
;
proc
->
instance_cnt_prach
=
-
1
;
proc
->
instance_cnt_asynch_rxtx
=
-
1
;
proc
->
instance_cnt_asynch_rxtx
=
-
1
;
proc
->
instance_cnt_synch
=
-
1
;
proc
->
CC_id
=
CC_id
;
proc
->
CC_id
=
CC_id
;
proc
->
first_rx
=
1
;
proc
->
first_rx
=
1
;
...
...
targets/RT/USER/lte-ru.c
View file @
d1f7346c
...
@@ -987,6 +987,7 @@ static void* ru_thread_prach( void* param ) {
...
@@ -987,6 +987,7 @@ static void* ru_thread_prach( void* param ) {
ru_thread_prach_status
=
0
;
ru_thread_prach_status
=
0
;
thread_top_init
(
"ru_thread_prach"
,
1
,
500000
,
1000000
,
20000000
);
thread_top_init
(
"ru_thread_prach"
,
1
,
500000
,
1000000
,
20000000
);
wait_sync
(
"ru_thread_prach"
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
@@ -1026,6 +1027,7 @@ static void* ru_thread_prach_br( void* param ) {
...
@@ -1026,6 +1027,7 @@ static void* ru_thread_prach_br( void* param ) {
ru_thread_prach_status
=
0
;
ru_thread_prach_status
=
0
;
thread_top_init
(
"ru_thread_prach_br"
,
1
,
500000
,
1000000
,
20000000
);
thread_top_init
(
"ru_thread_prach_br"
,
1
,
500000
,
1000000
,
20000000
);
wait_sync
(
ru_thread_prach_br
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
...
@@ -1413,6 +1415,7 @@ static void* ru_thread_tx( void* param ) {
...
@@ -1413,6 +1415,7 @@ static void* ru_thread_tx( void* param ) {
//CPU_SET(5, &cpuset);
//CPU_SET(5, &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
//pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
wait_sync
(
"ru_thread_tx"
);
wait_on_condition
(
&
proc
->
mutex_FH1
,
&
proc
->
cond_FH1
,
&
proc
->
instance_cnt_FH1
,
"ru_thread_tx"
);
wait_on_condition
(
&
proc
->
mutex_FH1
,
&
proc
->
cond_FH1
,
&
proc
->
instance_cnt_FH1
,
"ru_thread_tx"
);
...
...
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