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
2a97e60d
Commit
2a97e60d
authored
Sep 26, 2019
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nr-ip-over-LTE: Debug logs rearrangements
parent
86b710fa
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
47 additions
and
44 deletions
+47
-44
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+6
-2
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+11
-11
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+15
-10
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+5
-3
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
+2
-0
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+4
-1
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
+1
-14
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
View file @
2a97e60d
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
#include "PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.h"
#include "PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.h"
#include "PHY/CODING/nrLDPC_decoder/nrLDPC_types.h"
#include "PHY/CODING/nrLDPC_decoder/nrLDPC_types.h"
//#define DEBUG_DLSCH_DECODING
//#define DEBUG_DLSCH_DECODING
//#define ENABLE_PHY_PAYLOAD_DEBUG 1
#define OAI_LDPC_MAX_NUM_LLR 27000//26112 // NR_LDPC_NCOL_BG1*NR_LDPC_ZMAX
#define OAI_LDPC_MAX_NUM_LLR 27000//26112 // NR_LDPC_NCOL_BG1*NR_LDPC_ZMAX
...
@@ -593,7 +594,7 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -593,7 +594,7 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
if
((
err_flag
==
0
)
&&
(
ret
>=
(
1
+
dlsch
->
max_ldpc_iterations
)))
{
// a Code segment is in error so break;
if
((
err_flag
==
0
)
&&
(
ret
>=
(
1
+
dlsch
->
max_ldpc_iterations
)))
{
// a Code segment is in error so break;
LOG_
D
(
PHY
,
"AbsSubframe %d.%d CRC failed, segment %d/%d
\n
"
,
frame
%
1024
,
nr_tti_rx
,
r
,
harq_process
->
C
-
1
);
LOG_
I
(
PHY
,
"AbsSubframe %d.%d CRC failed, segment %d/%d
\n
"
,
frame
%
1024
,
nr_tti_rx
,
r
,
harq_process
->
C
-
1
);
err_flag
=
1
;
err_flag
=
1
;
}
}
}
}
...
@@ -687,12 +688,15 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -687,12 +688,15 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
printf("%d : %d \n", i, harq_process->b[i]);
printf("%d : %d \n", i, harq_process->b[i]);
}*/
}*/
#endif
#endif
#if defined(ENABLE_PHY_PAYLOAD_DEBUG)
if
(
frame
%
100
==
0
){
if
(
frame
%
100
==
0
){
LOG_I
(
PHY
,
"Printing 10
0
first payload bytes at frame: %d "
,
frame
);
LOG_I
(
PHY
,
"Printing 10 first payload bytes at frame: %d "
,
frame
);
for
(
int
i
=
0
;
i
<
10
;
i
++
){
//Kr_bytes
for
(
int
i
=
0
;
i
<
10
;
i
++
){
//Kr_bytes
LOG_I
(
PHY
,
"[%d] : %x "
,
i
,
harq_process
->
b
[
i
]);
LOG_I
(
PHY
,
"[%d] : %x "
,
i
,
harq_process
->
b
[
i
]);
}
}
}
}
#endif
}
}
...
...
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
2a97e60d
...
@@ -217,17 +217,17 @@ int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config){
...
@@ -217,17 +217,17 @@ int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config){
if
(
phy_config
!=
NULL
){
if
(
phy_config
!=
NULL
){
if
(
phy_config
->
config_req
.
config_mask
&
FAPI_NR_CONFIG_REQUEST_MASK_PBCH
){
if
(
phy_config
->
config_req
.
config_mask
&
FAPI_NR_CONFIG_REQUEST_MASK_PBCH
){
LOG_
D
(
MAC
,
"[L1][IF module][PHY CONFIG]
\n
"
);
LOG_
I
(
MAC
,
"[L1][IF module][PHY CONFIG]
\n
"
);
LOG_
D
(
MAC
,
"subcarrier spacing: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
subcarrier_spacing_common
);
LOG_
I
(
MAC
,
"subcarrier spacing: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
subcarrier_spacing_common
);
LOG_
D
(
MAC
,
"ssb carrier offset: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
ssb_subcarrier_offset
);
LOG_
I
(
MAC
,
"ssb carrier offset: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
ssb_subcarrier_offset
);
LOG_
D
(
MAC
,
"dmrs type A position: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
dmrs_type_a_position
);
LOG_
I
(
MAC
,
"dmrs type A position: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
dmrs_type_a_position
);
LOG_
D
(
MAC
,
"pdcch config sib1: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
pdcch_config_sib1
);
LOG_
I
(
MAC
,
"pdcch config sib1: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
pdcch_config_sib1
);
LOG_
D
(
MAC
,
"cell barred: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
cell_barred
);
LOG_
I
(
MAC
,
"cell barred: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
cell_barred
);
LOG_
D
(
MAC
,
"intra frequency reselection: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
intra_frequency_reselection
);
LOG_
I
(
MAC
,
"intra frequency reselection: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
intra_frequency_reselection
);
LOG_
D
(
MAC
,
"system frame number: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
system_frame_number
);
LOG_
I
(
MAC
,
"system frame number: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
system_frame_number
);
LOG_
D
(
MAC
,
"ssb index: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
ssb_index
);
LOG_
I
(
MAC
,
"ssb index: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
ssb_index
);
LOG_
D
(
MAC
,
"half frame bit: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
half_frame_bit
);
LOG_
I
(
MAC
,
"half frame bit: %d
\n
"
,
phy_config
->
config_req
.
pbch_config
.
half_frame_bit
);
LOG_
D
(
MAC
,
"-------------------------------
\n
"
);
LOG_
I
(
MAC
,
"-------------------------------
\n
"
);
memcpy
(
&
nrUE_config
.
pbch_config
,
&
phy_config
->
config_req
.
pbch_config
,
sizeof
(
fapi_nr_pbch_config_t
));
memcpy
(
&
nrUE_config
.
pbch_config
,
&
phy_config
->
config_req
.
pbch_config
,
sizeof
(
fapi_nr_pbch_config_t
));
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
2a97e60d
...
@@ -4336,7 +4336,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
...
@@ -4336,7 +4336,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
// looking for pbch only in slot where it is supposed to be
// looking for pbch only in slot where it is supposed to be
if
((
ue
->
decode_MIB
==
1
)
&&
slot_pbch
)
if
((
ue
->
decode_MIB
==
1
)
&&
slot_pbch
)
{
{
LOG_
D
(
PHY
,
" ------ PBCH ChannelComp/LLR: frame.slot %d.%d ------
\n
"
,
frame_rx
%
1024
,
nr_tti_rx
);
LOG_
I
(
PHY
,
" ------ PBCH ChannelComp/LLR: frame.slot %d.%d ------
\n
"
,
frame_rx
%
1024
,
nr_tti_rx
);
for
(
int
i
=
1
;
i
<
4
;
i
++
)
{
for
(
int
i
=
1
;
i
<
4
;
i
++
)
{
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
2a97e60d
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <stdio.h>
#include <math.h>
#include <math.h>
#define ENABLE_MAC_PAYLOAD_DEBUG 1
//
#define ENABLE_MAC_PAYLOAD_DEBUG 1
extern
void
mac_rlc_data_ind
(
extern
void
mac_rlc_data_ind
(
const
module_id_t
module_idP
,
const
module_id_t
module_idP
,
...
@@ -228,7 +228,7 @@ int8_t nr_ue_decode_mib(
...
@@ -228,7 +228,7 @@ int8_t nr_ue_decode_mib(
void
*
pduP
,
void
*
pduP
,
uint16_t
cell_id
){
uint16_t
cell_id
){
LOG_
D
(
MAC
,
"[L2][MAC] decode mib
\n
"
);
LOG_
I
(
MAC
,
"[L2][MAC] decode mib
\n
"
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @
2a97e60d
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include "PHY/NR_TRANSPORT/nr_dci.h"
#include "PHY/NR_TRANSPORT/nr_dci.h"
#include "executables/nr-softmodem.h"
#include "executables/nr-softmodem.h"
extern
RAN_CONTEXT_t
RC
;
extern
RAN_CONTEXT_t
RC
;
//#define ENABLE_MAC_PAYLOAD_DEBUG 1
/*Scheduling of DLSCH with associated DCI in common search space
/*Scheduling of DLSCH with associated DCI in common search space
* current version has only a DCI for type 1 PDCCH for C_RNTI*/
* current version has only a DCI for type 1 PDCCH for C_RNTI*/
...
@@ -459,10 +460,12 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
...
@@ -459,10 +460,12 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
TBS_bytes
=
configure_fapi_dl_Tx
(
dl_req
,
TX_req
,
cfg
,
&
nr_mac
->
coreset
[
CC_id
][
1
],
&
nr_mac
->
search_space
[
CC_id
][
1
],
nr_mac
->
pdu_index
[
CC_id
]);
TBS_bytes
=
configure_fapi_dl_Tx
(
dl_req
,
TX_req
,
cfg
,
&
nr_mac
->
coreset
[
CC_id
][
1
],
&
nr_mac
->
search_space
[
CC_id
][
1
],
nr_mac
->
pdu_index
[
CC_id
]);
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
LOG_I
(
MAC
,
"Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, , TBS size: %d
\n
\n
"
,
frameP
,
slotP
,
TBS_bytes
);
LOG_I
(
MAC
,
"Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, , TBS size: %d
\n
\n
"
,
frameP
,
slotP
,
TBS_bytes
);
for
(
int
i
=
0
;
i
<
10
;
i
++
)
{
// TBS_bytes dlsch_pdu_rel15->transport_block_size/8 6784/8
for
(
int
i
=
0
;
i
<
10
;
i
++
)
{
// TBS_bytes dlsch_pdu_rel15->transport_block_size/8 6784/8
LOG_I
(
MAC
,
"%x. "
,
((
uint8_t
*
)
nr_mac
->
UE_list
.
DLSCH_pdu
[
CC_id
][
0
][
0
].
payload
[
0
])[
i
]);
LOG_I
(
MAC
,
"%x. "
,
((
uint8_t
*
)
nr_mac
->
UE_list
.
DLSCH_pdu
[
CC_id
][
0
][
0
].
payload
[
0
])[
i
]);
}
}
#endif
//TX_req->segments[0].segment_length = 8;
//TX_req->segments[0].segment_length = 8;
TX_req
->
segments
[
0
].
segment_length
=
TBS_bytes
+
2
;
TX_req
->
segments
[
0
].
segment_length
=
TBS_bytes
+
2
;
...
@@ -487,12 +490,14 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
...
@@ -487,12 +490,14 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
((
uint8_t
*
)
nr_mac
->
UE_list
.
DLSCH_pdu
[
CC_id
][
0
][
0
].
payload
[
0
])[
i
]
=
(
unsigned
char
)
rand
();
((
uint8_t
*
)
nr_mac
->
UE_list
.
DLSCH_pdu
[
CC_id
][
0
][
0
].
payload
[
0
])[
i
]
=
(
unsigned
char
)
rand
();
//LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
//LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
}
}
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
if
(
frameP
%
100
==
0
){
if
(
frameP
%
100
==
0
){
LOG_I
(
MAC
,
"Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, TBS size: %d
\n
"
,
frameP
,
slotP
,
TBS_bytes
);
LOG_I
(
MAC
,
"Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, TBS size: %d
\n
"
,
frameP
,
slotP
,
TBS_bytes
);
for
(
int
i
=
0
;
i
<
10
;
i
++
)
{
for
(
int
i
=
0
;
i
<
10
;
i
++
)
{
LOG_I
(
MAC
,
"%x. "
,
((
uint8_t
*
)
nr_mac
->
UE_list
.
DLSCH_pdu
[
CC_id
][
0
][
0
].
payload
[
0
])[
i
]);
LOG_I
(
MAC
,
"%x. "
,
((
uint8_t
*
)
nr_mac
->
UE_list
.
DLSCH_pdu
[
CC_id
][
0
][
0
].
payload
[
0
])[
i
]);
}
}
}
}
#endif
//TX_req->segments[0].segment_length = 8;
//TX_req->segments[0].segment_length = 8;
TX_req
->
segments
[
0
].
segment_length
=
TBS_bytes
+
2
;
TX_req
->
segments
[
0
].
segment_length
=
TBS_bytes
+
2
;
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
2a97e60d
...
@@ -1053,10 +1053,12 @@ pdcp_data_ind(
...
@@ -1053,10 +1053,12 @@ pdcp_data_ind(
&
sdu_buffer_pP
->
data
[
payload_offset
],
&
sdu_buffer_pP
->
data
[
payload_offset
],
sdu_buffer_sizeP
-
payload_offset
);
sdu_buffer_sizeP
-
payload_offset
);
LOG_I
(
PDCP
,
"Printing PDCP SDU before adding it to the list:
\n
"
);
#if defined(ENABLE_PDCP_PAYLOAD_DEBUG)
LOG_I
(
PDCP
,
"Printing first bytes of PDCP SDU before adding it to the list:
\n
"
);
for
(
int
i
=
0
;
i
<
30
;
i
++
){
for
(
int
i
=
0
;
i
<
30
;
i
++
){
LOG_I
(
PDCP
,
"%x"
,
sdu_buffer_pP
->
data
[
i
]);
LOG_I
(
PDCP
,
"%x"
,
sdu_buffer_pP
->
data
[
i
]);
}
}
#endif
list_add_tail_eurecom
(
new_sdu_p
,
sdu_list_p
);
list_add_tail_eurecom
(
new_sdu_p
,
sdu_list_p
);
}
}
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
View file @
2a97e60d
...
@@ -93,6 +93,8 @@ extern int pdcp_instance_cnt;
...
@@ -93,6 +93,8 @@ extern int pdcp_instance_cnt;
#define PROTOCOL_PDCP_CTXT_ARGS(CTXT_Pp, pDCP_Pp) PROTOCOL_CTXT_ARGS(CTXT_Pp),\
#define PROTOCOL_PDCP_CTXT_ARGS(CTXT_Pp, pDCP_Pp) PROTOCOL_CTXT_ARGS(CTXT_Pp),\
(pDCP_Pp->is_srb) ? "SRB" : "DRB",\
(pDCP_Pp->is_srb) ? "SRB" : "DRB",\
pDCP_Pp->rb_id
pDCP_Pp->rb_id
//#define ENABLE_PDCP_PAYLOAD_DEBUG 1
int
init_pdcp_thread
(
void
);
int
init_pdcp_thread
(
void
);
void
cleanup_pdcp_thread
(
void
);
void
cleanup_pdcp_thread
(
void
);
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
2a97e60d
...
@@ -135,10 +135,13 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
...
@@ -135,10 +135,13 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
}
// PDCP_USE_NETLINK
}
// PDCP_USE_NETLINK
AssertFatal
(
ret
>=
0
,
"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s)
\n
"
,
errno
,
strerror
(
errno
));
AssertFatal
(
ret
>=
0
,
"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s)
\n
"
,
errno
,
strerror
(
errno
));
LOG_I
(
PDCP
,
"Printing PDCP SDU before removing it from the list:
\n
"
);
#if defined(ENABLE_PDCP_PAYLOAD_DEBUG)
LOG_I
(
PDCP
,
"Printing first bytes of PDCP SDU before removing it from the list:
\n
"
);
for
(
int
i
=
0
;
i
<
30
;
i
++
){
for
(
int
i
=
0
;
i
<
30
;
i
++
){
LOG_I
(
PDCP
,
"%x"
,
sdu_p
->
data
[
i
]);
LOG_I
(
PDCP
,
"%x"
,
sdu_p
->
data
[
i
]);
}
}
#endif
list_remove_head
(
&
pdcp_sdu_list
);
list_remove_head
(
&
pdcp_sdu_list
);
free_mem_block
(
sdu_p
,
__func__
);
free_mem_block
(
sdu_p
,
__func__
);
pdcp_nb_sdu_sent
++
;
pdcp_nb_sdu_sent
++
;
...
...
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
View file @
2a97e60d
...
@@ -726,7 +726,6 @@ void rlc_um_check_timer_dar_time_out(
...
@@ -726,7 +726,6 @@ void rlc_um_check_timer_dar_time_out(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RLC_UM_CHECK_TIMER_DAR_TIME_OUT
,
VCD_FUNCTION_IN
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RLC_UM_CHECK_TIMER_DAR_TIME_OUT
,
VCD_FUNCTION_IN
);
if
((
rlc_pP
->
t_reordering
.
running
))
{
if
((
rlc_pP
->
t_reordering
.
running
))
{
//LOG_I(RLC, "[rlc_um_check_timer_dar_time_out] 2 \n");
if
(
if
(
// CASE 1: start time out
// CASE 1: start time out
// +-----------+------------------+----------+
// +-----------+------------------+----------+
...
@@ -787,7 +786,6 @@ void rlc_um_check_timer_dar_time_out(
...
@@ -787,7 +786,6 @@ void rlc_um_check_timer_dar_time_out(
LOG_D
(
RLC
,
" %d"
,
rlc_pP
->
vr_ur
);
LOG_D
(
RLC
,
" %d"
,
rlc_pP
->
vr_ur
);
LOG_D
(
RLC
,
"
\n
"
);
LOG_D
(
RLC
,
"
\n
"
);
#endif
#endif
LOG_I
(
RLC
,
"[rlc_um_check_timer_dar_time_out] 3
\n
"
);
rlc_um_try_reassembly
(
ctxt_pP
,
rlc_pP
,
old_vr_ur
,
rlc_pP
->
vr_ur
);
rlc_um_try_reassembly
(
ctxt_pP
,
rlc_pP
,
old_vr_ur
,
rlc_pP
->
vr_ur
);
in_window
=
rlc_um_in_window
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
,
rlc_pP
->
vr_uh
,
rlc_pP
->
vr_uh
);
in_window
=
rlc_um_in_window
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
,
rlc_pP
->
vr_uh
,
rlc_pP
->
vr_uh
);
...
@@ -1040,7 +1038,6 @@ rlc_um_receive_process_dar (
...
@@ -1040,7 +1038,6 @@ rlc_um_receive_process_dar (
}
else
{
}
else
{
free_mem_block
(
pdu_mem_pP
,
__func__
);
free_mem_block
(
pdu_mem_pP
,
__func__
);
pdu_mem_pP
=
NULL
;
pdu_mem_pP
=
NULL
;
//LOG_I(RLC, "[rlc_um_receive_process_dar] Problematic case 1 \n");
return
;
return
;
}
}
...
@@ -1067,7 +1064,6 @@ rlc_um_receive_process_dar (
...
@@ -1067,7 +1064,6 @@ rlc_um_receive_process_dar (
rlc_pP
->
stat_rx_data_pdu_out_of_window
+=
1
;
rlc_pP
->
stat_rx_data_pdu_out_of_window
+=
1
;
rlc_pP
->
stat_rx_data_bytes_out_of_window
+=
tb_sizeP
;
rlc_pP
->
stat_rx_data_bytes_out_of_window
+=
tb_sizeP
;
free_mem_block
(
pdu_mem_pP
,
__func__
);
free_mem_block
(
pdu_mem_pP
,
__func__
);
//LOG_I(RLC, "[rlc_um_receive_process_dar] Problematic case 2 \n");
pdu_mem_pP
=
NULL
;
pdu_mem_pP
=
NULL
;
RLC_UM_MUTEX_UNLOCK
(
&
rlc_pP
->
lock_dar_buffer
);
RLC_UM_MUTEX_UNLOCK
(
&
rlc_pP
->
lock_dar_buffer
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RLC_UM_RECEIVE_PROCESS_DAR
,
VCD_FUNCTION_OUT
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RLC_UM_RECEIVE_PROCESS_DAR
,
VCD_FUNCTION_OUT
);
...
@@ -1086,7 +1082,6 @@ rlc_um_receive_process_dar (
...
@@ -1086,7 +1082,6 @@ rlc_um_receive_process_dar (
//discard the PDU
//discard the PDU
rlc_pP
->
stat_rx_data_pdus_duplicate
+=
1
;
rlc_pP
->
stat_rx_data_pdus_duplicate
+=
1
;
rlc_pP
->
stat_rx_data_bytes_duplicate
+=
tb_sizeP
;
rlc_pP
->
stat_rx_data_bytes_duplicate
+=
tb_sizeP
;
//LOG_I(RLC, "[rlc_um_receive_process_dar] Problematic case 3 \n");
free_mem_block
(
pdu_mem_pP
,
__func__
);
free_mem_block
(
pdu_mem_pP
,
__func__
);
pdu_mem_pP
=
NULL
;
pdu_mem_pP
=
NULL
;
RLC_UM_MUTEX_UNLOCK
(
&
rlc_pP
->
lock_dar_buffer
);
RLC_UM_MUTEX_UNLOCK
(
&
rlc_pP
->
lock_dar_buffer
);
...
@@ -1119,7 +1114,6 @@ rlc_um_receive_process_dar (
...
@@ -1119,7 +1114,6 @@ rlc_um_receive_process_dar (
// -if VR(UR) falls outside of the reordering window:
// -if VR(UR) falls outside of the reordering window:
// -set VR(UR) to (VR(UH) – UM_Window_Size);
// -set VR(UR) to (VR(UH) – UM_Window_Size);
if
(
rlc_um_in_reordering_window
(
ctxt_pP
,
rlc_pP
,
sn
)
<
0
)
{
if
(
rlc_um_in_reordering_window
(
ctxt_pP
,
rlc_pP
,
sn
)
<
0
)
{
LOG_I
(
RLC
,
"[rlc_um_receive_process_dar] Before calling rlc_um_try_reassembly() 1
\n
"
);
#if TRACE_RLC_UM_DAR
#if TRACE_RLC_UM_DAR
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" RX PDU SN %d OUTSIDE REORDERING WINDOW VR(UH)=%d UM_Window_Size=%d
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" RX PDU SN %d OUTSIDE REORDERING WINDOW VR(UH)=%d UM_Window_Size=%d
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
...
@@ -1135,7 +1129,6 @@ rlc_um_receive_process_dar (
...
@@ -1135,7 +1129,6 @@ rlc_um_receive_process_dar (
if
(
in_window
<
0
)
{
if
(
in_window
<
0
)
{
in_window
=
in_window
+
rlc_pP
->
rx_sn_modulo
;
in_window
=
in_window
+
rlc_pP
->
rx_sn_modulo
;
}
}
LOG_I
(
RLC
,
"[rlc_um_receive_process_dar] Before calling rlc_um_try_reassembly() 2
\n
"
);
rlc_um_try_reassembly
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
,
in_window
);
rlc_um_try_reassembly
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
,
in_window
);
}
}
...
@@ -1160,18 +1153,12 @@ rlc_um_receive_process_dar (
...
@@ -1160,18 +1153,12 @@ rlc_um_receive_process_dar (
// SDUs to upper layer in ascending order of the RLC SN if not
// SDUs to upper layer in ascending order of the RLC SN if not
// delivered before;
// delivered before;
if
((
sn
==
rlc_pP
->
vr_ur
)
&&
rlc_um_get_pdu_from_dar_buffer
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
))
{
if
((
sn
==
rlc_pP
->
vr_ur
)
&&
rlc_um_get_pdu_from_dar_buffer
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
))
{
LOG_I
(
RLC
,
"[rlc_um_receive_process_dar] Before calling rlc_um_try_reassembly() 3
\n
"
);
//sn_tmp = rlc_pP->vr_ur;
//sn_tmp = rlc_pP->vr_ur;
do
{
do
{
rlc_pP
->
vr_ur
=
(
rlc_pP
->
vr_ur
+
1
)
%
rlc_pP
->
rx_sn_modulo
;
rlc_pP
->
vr_ur
=
(
rlc_pP
->
vr_ur
+
1
)
%
rlc_pP
->
rx_sn_modulo
;
}
while
(
rlc_um_get_pdu_from_dar_buffer
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
)
&&
(
rlc_pP
->
vr_ur
!=
rlc_pP
->
vr_uh
));
}
while
(
rlc_um_get_pdu_from_dar_buffer
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
)
&&
(
rlc_pP
->
vr_ur
!=
rlc_pP
->
vr_uh
));
LOG_I
(
RLC
,
"[rlc_um_receive_process_dar] Before calling rlc_um_try_reassembly() 4
\n
"
);
rlc_um_try_reassembly
(
ctxt_pP
,
rlc_pP
,
sn
,
rlc_pP
->
vr_ur
);
rlc_um_try_reassembly
(
ctxt_pP
,
rlc_pP
,
sn
,
rlc_pP
->
vr_ur
);
}
}
else
if
(
sn
!=
rlc_pP
->
vr_ur
)
LOG_I
(
RLC
,
"[rlc_um_receive_process_dar] Problematic case 5, sn: %d, rlc_pP->vr_ur: %d
\n
"
,
sn
,
rlc_pP
->
vr_ur
);
else
if
(
!
rlc_um_get_pdu_from_dar_buffer
(
ctxt_pP
,
rlc_pP
,
rlc_pP
->
vr_ur
))
//LOG_I(RLC, "[rlc_um_receive_process_dar] Problematic case 6 \n");
// -if t-Reordering is running:
// -if t-Reordering is running:
// -if VR(UX) <= VR(UR); or
// -if VR(UX) <= VR(UR); or
...
...
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