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
c0162d06
Commit
c0162d06
authored
Mar 03, 2020
by
wujing
Committed by
masayuki.harada
Mar 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add mutex for input_sdus in rlc to try to avoid segfault
parent
5c65094e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
+2
-2
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
+2
-2
No files found.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
View file @
c0162d06
...
@@ -527,7 +527,7 @@ rlc_am_mac_status_indication (
...
@@ -527,7 +527,7 @@ rlc_am_mac_status_indication (
status_resp
.
buffer_occupancy_in_bytes
+=
(
header_overhead
+
max_li_overhead
);
status_resp
.
buffer_occupancy_in_bytes
+=
(
header_overhead
+
max_li_overhead
);
}
}
RLC_AM_MUTEX_LOCK
(
&
rlc
->
lock_input_sdus
,
ctxt_pP
,
rlc
);
if
((
rlc
->
input_sdus
[
rlc
->
current_sdu_index
].
mem_block
!=
NULL
)
&&
(
status_resp
.
buffer_occupancy_in_bytes
))
{
if
((
rlc
->
input_sdus
[
rlc
->
current_sdu_index
].
mem_block
!=
NULL
)
&&
(
status_resp
.
buffer_occupancy_in_bytes
))
{
//status_resp.buffer_occupancy_in_bytes += ((rlc_am_entity_t *) rlc)->tx_header_min_length_in_bytes;
//status_resp.buffer_occupancy_in_bytes += ((rlc_am_entity_t *) rlc)->tx_header_min_length_in_bytes;
status_resp
.
buffer_occupancy_in_pdus
=
rlc
->
nb_sdu
;
status_resp
.
buffer_occupancy_in_pdus
=
rlc
->
nb_sdu
;
...
@@ -553,7 +553,7 @@ rlc_am_mac_status_indication (
...
@@ -553,7 +553,7 @@ rlc_am_mac_status_indication (
status_resp
.
head_sdu_is_segmented
=
1
;
status_resp
.
head_sdu_is_segmented
=
1
;
}
}
}
}
RLC_AM_MUTEX_UNLOCK
(
&
rlc
->
lock_input_sdus
);
if
(
MESSAGE_CHART_GENERATOR
)
{
if
(
MESSAGE_CHART_GENERATOR
)
{
MSC_LOG_RX_MESSAGE
(
MSC_LOG_RX_MESSAGE
(
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_YES
)
?
MSC_RLC_ENB
:
MSC_RLC_UE
,
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_YES
)
?
MSC_RLC_ENB
:
MSC_RLC_UE
,
...
...
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
View file @
c0162d06
...
@@ -388,7 +388,7 @@ rlc_um_mac_status_indication (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP
...
@@ -388,7 +388,7 @@ rlc_um_mac_status_indication (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP
rlc_um_check_timer_dar_time_out
(
ctxt_pP
,
rlc_p
);
rlc_um_check_timer_dar_time_out
(
ctxt_pP
,
rlc_p
);
rlc_p
->
nb_bytes_requested_by_mac
=
tbs_sizeP
;
rlc_p
->
nb_bytes_requested_by_mac
=
tbs_sizeP
;
status_resp
.
buffer_occupancy_in_bytes
=
rlc_um_get_buffer_occupancy
(
rlc_p
);
status_resp
.
buffer_occupancy_in_bytes
=
rlc_um_get_buffer_occupancy
(
rlc_p
);
RLC_UM_MUTEX_LOCK
(
&
rlc_p
->
lock_input_sdus
,
ctxt_pP
,
rlc_p
);
if
((
status_resp
.
buffer_occupancy_in_bytes
>
0
)
&&
((
mb_p
=
list_get_head
(
&
rlc_p
->
input_sdus
))
!=
NULL
))
{
if
((
status_resp
.
buffer_occupancy_in_bytes
>
0
)
&&
((
mb_p
=
list_get_head
(
&
rlc_p
->
input_sdus
))
!=
NULL
))
{
if
(
enb_flagP
==
ENB_FLAG_YES
)
{
if
(
enb_flagP
==
ENB_FLAG_YES
)
{
/* For eNB: add minimum RLC UM header size for the scheduler */
/* For eNB: add minimum RLC UM header size for the scheduler */
...
@@ -411,7 +411,7 @@ rlc_um_mac_status_indication (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP
...
@@ -411,7 +411,7 @@ rlc_um_mac_status_indication (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP
}
}
}
else
{
}
else
{
}
}
RLC_UM_MUTEX_UNLOCK
(
&
rlc_p
->
lock_input_sdus
);
status_resp
.
rlc_info
.
rlc_protocol_state
=
rlc_p
->
protocol_state
;
status_resp
.
rlc_info
.
rlc_protocol_state
=
rlc_p
->
protocol_state
;
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
...
...
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