Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
9ad45316
Commit
9ad45316
authored
Apr 10, 2018
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RLC assertion 760~796 add 1428 1429
parent
affe9452
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
287 additions
and
31 deletions
+287
-31
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.c
+9
-0
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
+12
-2
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c
+16
-2
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
+152
-20
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
+98
-7
No files found.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.c
View file @
9ad45316
...
@@ -42,8 +42,17 @@ void rlc_am_free_in_sdu(
...
@@ -42,8 +42,17 @@ void rlc_am_free_in_sdu(
{
{
if
(
index_in_bufferP
<=
RLC_AM_SDU_CONTROL_BUFFER_SIZE
)
{
if
(
index_in_bufferP
<=
RLC_AM_SDU_CONTROL_BUFFER_SIZE
)
{
/* BugFix: SDU shall have been already freed during initial PDU segmentation or concatenation !! */
/* BugFix: SDU shall have been already freed during initial PDU segmentation or concatenation !! */
//Assertion(eNB)_PRAN_DesignDocument_annex No.761
if
(
rlcP
->
input_sdus
[
index_in_bufferP
].
mem_block
!=
NULL
)
{
LOG_E
(
RLC
,
"RLC AM Tx SDU Conf: Data Part is not empty index=%d LcId=%d
\n
"
,
index_in_bufferP
,
rlcP
->
channel_id
);
return
;
}
/*
AssertFatal(rlcP->input_sdus[index_in_bufferP].mem_block == NULL, "RLC AM Tx SDU Conf: Data Part is not empty index=%d LcId=%d\n",
AssertFatal(rlcP->input_sdus[index_in_bufferP].mem_block == NULL, "RLC AM Tx SDU Conf: Data Part is not empty index=%d LcId=%d\n",
index_in_bufferP,rlcP->channel_id);
index_in_bufferP,rlcP->channel_id);
*/
/*
/*
if (rlcP->input_sdus[index_in_bufferP].mem_block != NULL) {
if (rlcP->input_sdus[index_in_bufferP].mem_block != NULL) {
free_mem_block(rlcP->input_sdus[index_in_bufferP].mem_block, __func__);
free_mem_block(rlcP->input_sdus[index_in_bufferP].mem_block, __func__);
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
View file @
9ad45316
...
@@ -198,10 +198,16 @@ rlc_am_send_sdu (
...
@@ -198,10 +198,16 @@ rlc_am_send_sdu (
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
));
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
));
//msg("[RLC_AM][MOD %d] Freeing mem_block ...\n", rlc_pP->module_id);
//msg("[RLC_AM][MOD %d] Freeing mem_block ...\n", rlc_pP->module_id);
//free_mem_block (rlc_pP->output_sdu_in_construction, __func__);
//free_mem_block (rlc_pP->output_sdu_in_construction, __func__);
//Assertion(eNB)_PRAN_DesignDocument_annex No.764
LOG_E
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
" SEND SDU REQUESTED %d bytes
\n
"
,
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
rlc_pP
->
output_sdu_size_to_write
);
/*
AssertFatal(3==4,
AssertFatal(3==4,
PROTOCOL_RLC_AM_CTXT_FMT" SEND SDU REQUESTED %d bytes",
PROTOCOL_RLC_AM_CTXT_FMT" SEND SDU REQUESTED %d bytes",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
rlc_pP->output_sdu_size_to_write);
rlc_pP->output_sdu_size_to_write);
*/
}
}
rlc_pP
->
output_sdu_size_to_write
=
0
;
rlc_pP
->
output_sdu_size_to_write
=
0
;
...
@@ -270,7 +276,9 @@ rlc_am_reassemble_pdu(
...
@@ -270,7 +276,9 @@ rlc_am_reassemble_pdu(
break
;
break
;
default:
default:
assert
(
0
!=
0
);
//Assertion(eNB)_PRAN_DesignDocument_annex No.1428
LOG_E
(
RLC
,
"RLC_E_FIXED_PART_DATA_FIELD_FOLLOW error pdu_info->fi[%d]
\n
"
,
pdu_info
->
fi
);
// assert(0 != 0);
}
}
}
else
{
}
else
{
switch
(
pdu_info
->
fi
)
{
switch
(
pdu_info
->
fi
)
{
...
@@ -386,7 +394,9 @@ rlc_am_reassemble_pdu(
...
@@ -386,7 +394,9 @@ rlc_am_reassemble_pdu(
break
;
break
;
default:
default:
assert
(
1
!=
1
);
//Assertion(eNB)_PRAN_DesignDocument_annex No.1429
LOG_E
(
RLC
,
"not RLC_E_FIXED_PART_DATA_FIELD_FOLLOW error pdu_info->fi[%d]
\n
"
,
pdu_info
->
fi
);
// assert(1 != 1);
}
}
}
}
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c
View file @
9ad45316
...
@@ -47,9 +47,15 @@ rlc_am_get_data_pdu_infos(
...
@@ -47,9 +47,15 @@ rlc_am_get_data_pdu_infos(
pdu_info_pP
->
d_c
=
header_pP
->
b1
>>
7
;
pdu_info_pP
->
d_c
=
header_pP
->
b1
>>
7
;
pdu_info_pP
->
num_li
=
0
;
pdu_info_pP
->
num_li
=
0
;
//Assertion(eNB)_PRAN_DesignDocument_annex No.766
if
(
pdu_info_pP
->
d_c
==
0
)
{
LOG_E
(
RLC
,
"RLC AM Rx PDU Data D/C Header Error LcId=%d
\n
"
,
rlc_pP
->
channel_id
);
return
-
2
;
}
/*
AssertFatal (pdu_info_pP->d_c != 0, "RLC AM Rx PDU Data D/C Header Error LcId=%d\n", rlc_pP->channel_id);
AssertFatal (pdu_info_pP->d_c != 0, "RLC AM Rx PDU Data D/C Header Error LcId=%d\n", rlc_pP->channel_id);
*/
pdu_info_pP
->
rf
=
(
header_pP
->
b1
>>
6
)
&
0x01
;
pdu_info_pP
->
rf
=
(
header_pP
->
b1
>>
6
)
&
0x01
;
pdu_info_pP
->
p
=
(
header_pP
->
b1
>>
5
)
&
0x01
;
pdu_info_pP
->
p
=
(
header_pP
->
b1
>>
5
)
&
0x01
;
pdu_info_pP
->
fi
=
(
header_pP
->
b1
>>
3
)
&
0x03
;
pdu_info_pP
->
fi
=
(
header_pP
->
b1
>>
3
)
&
0x03
;
...
@@ -264,9 +270,17 @@ rlc_am_receive_routing (
...
@@ -264,9 +270,17 @@ rlc_am_receive_routing (
rlc_pP
->
stat_rx_control_pdu
+=
1
;
rlc_pP
->
stat_rx_control_pdu
+=
1
;
rlc_am_receive_process_control_pdu
(
ctxt_pP
,
rlc_pP
,
tb_p
,
&
first_byte_p
,
&
tb_size_in_bytes
);
rlc_am_receive_process_control_pdu
(
ctxt_pP
,
rlc_pP
,
tb_p
,
&
first_byte_p
,
&
tb_size_in_bytes
);
// Test if remaining bytes not processed (up to know, highest probability is bug in MAC)
// Test if remaining bytes not processed (up to know, highest probability is bug in MAC)
//Assertion(eNB)_PRAN_DesignDocument_annex No.767
if
(
tb_size_in_bytes
!=
0
)
{
LOG_E
(
RLC
,
"Remaining %d bytes following a control PDU
\n
"
,
tb_size_in_bytes
);
}
/*
AssertFatal( tb_size_in_bytes == 0,
AssertFatal( tb_size_in_bytes == 0,
"Remaining %d bytes following a control PDU",
"Remaining %d bytes following a control PDU",
tb_size_in_bytes);
tb_size_in_bytes);
*/
}
}
LOG_D
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[RX ROUTING] VR(R)=%03d VR(MR)=%03d
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[RX ROUTING] VR(R)=%03d VR(MR)=%03d
\n
"
,
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
View file @
9ad45316
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
View file @
9ad45316
This diff is collapsed.
Click to expand it.
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