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
lizhongxiao
OpenXG-RAN
Commits
780b5601
Commit
780b5601
authored
Jul 16, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed logging on TX path
parent
a137a266
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+4
-4
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+8
-8
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
+1
-1
No files found.
openair2/LAYER2/MAC/ue_procedures.c
View file @
780b5601
...
...
@@ -3466,14 +3466,14 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
LOG_D
(
MAC
,
"absSF_offset %d (test %d): Checking status (%d,Dest %d) => LCID %d => %d bytes
\n
"
,
absSF_offset
,
slsch_test
,
ue
->
sourceL2Id
,
ue
->
sl_info
[
i
].
destinationL2Id
,
ue
->
sl_info
[
i
].
LCID
,
rlc_status
.
bytes_in_buffer
);
if
(
rlc_status
.
bytes_in_buffer
>
2
||
slsch_test
==
1
){
if
(
slsch_test
==
1
&&
rlc_status
.
bytes_in_buffer
<=
2
)
rlc_status
.
bytes_in_buffer
=
300
;
LOG_
I
(
MAC
,
"SFN.SF %d.%d: Scheduling for %d bytes in Sidelink buffer
\n
"
,
frameP
,
subframeP
,
rlc_status
.
bytes_in_buffer
);
LOG_
D
(
MAC
,
"SFN.SF %d.%d: Scheduling for %d bytes in Sidelink buffer
\n
"
,
frameP
,
subframeP
,
rlc_status
.
bytes_in_buffer
);
// Fill in group id for off-network communications
ue
->
sltx_active
=
1
;
//store LCID, destinationL2Id
ue
->
slsch_lcid
=
ue
->
sl_info
[
i
].
LCID
;
ue
->
destinationL2Id
=
ue
->
sl_info
[
i
].
destinationL2Id
;
LOG_
I
(
MAC
,
"LCID %d, source L2ID 0x%08x, destinationL2Id: 0x%08x
\n
"
,
ue
->
slsch_lcid
,
ue
->
sourceL2Id
,
ue
->
destinationL2Id
);
LOG_
D
(
MAC
,
"LCID %d, source L2ID 0x%08x, destinationL2Id: 0x%08x
\n
"
,
ue
->
slsch_lcid
,
ue
->
sourceL2Id
,
ue
->
destinationL2Id
);
break
;
}
}
...
...
@@ -3486,13 +3486,13 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
if
(
slsch_test
==
1
&&
rlc_status
.
bytes_in_buffer
<=
2
)
rlc_status
.
bytes_in_buffer
=
300
;
LOG_
I
(
MAC
,
"SFN.SF %d.%d: Scheduling for %d bytes in Sidelink buffer
\n
"
,
frameP
,
subframeP
,
rlc_status
.
bytes_in_buffer
);
LOG_
D
(
MAC
,
"SFN.SF %d.%d: Scheduling for %d bytes in Sidelink buffer
\n
"
,
frameP
,
subframeP
,
rlc_status
.
bytes_in_buffer
);
// Fill in group id for off-network communications
ue
->
sltx_active
=
1
;
//store LCID, destinationL2Id
ue
->
slsch_lcid
=
ue
->
sl_info
[
i
].
LCID
;
ue
->
destinationL2Id
=
ue
->
sl_info
[
i
].
groupL2Id
;
LOG_
I
(
MAC
,
"LCID %d, source L2ID 0x%08x, groupL2Id: 0x%08x
\n
"
,
ue
->
slsch_lcid
,
ue
->
sourceL2Id
,
ue
->
destinationL2Id
);
LOG_
D
(
MAC
,
"LCID %d, source L2ID 0x%08x, groupL2Id: 0x%08x
\n
"
,
ue
->
slsch_lcid
,
ue
->
sourceL2Id
,
ue
->
destinationL2Id
);
break
;
}
}
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
780b5601
...
...
@@ -460,7 +460,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
AssertFatal
(
rab_id
<
maxDRB
,
"RB id is too high (%u/%d)!
\n
"
,
rab_id
,
maxDRB
);
if
(
rab_id
!=
0
)
{
LOG_
I
(
PDCP
,
"[FRAME %05d][%s][IP][INSTANCE %u][RB %u][--- PDCP_DATA_REQ "
LOG_
D
(
PDCP
,
"[FRAME %05d][%s][IP][INSTANCE %u][RB %u][--- PDCP_DATA_REQ "
"/ %d Bytes --->][PDCP][MOD %u][RB %u]
\n
"
,
ctxt_cpy
.
frame
,
(
ctxt_cpy
.
enb_flag
)
?
"eNB"
:
"UE"
,
...
...
@@ -626,19 +626,19 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
if
(
!
ctxt
.
enb_flag
)
{
if
(
rab_id
!=
0
)
{
if
(
rab_id
==
UE_IP_DEFAULT_RAB_ID
)
{
LOG_
I
(
PDCP
,
"PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%x, enb_flag=%d)
\n
"
,
LOG_
D
(
PDCP
,
"PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%x, enb_flag=%d)
\n
"
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
);
key
=
PDCP_COLL_KEY_DEFAULT_DRB_VALUE
(
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
);
h_rc
=
hashtable_get
(
pdcp_coll_p
,
key
,
(
void
**
)
&
pdcp_p
);
LOG_
I
(
PDCP
,
"request key %x : (%d,%x,%d,%d)
\n
"
,
LOG_
D
(
PDCP
,
"request key %x : (%d,%x,%d,%d)
\n
"
,
key
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
);
}
else
{
rab_id
=
rab_id
%
maxDRB
;
LOG_
I
(
PDCP
,
"PDCP_COLL_KEY_VALUE(module_id=%d, rnti=%x, enb_flag=%d, rab_id=%d, SRB_FLAG=%d)
\n
"
,
LOG_
D
(
PDCP
,
"PDCP_COLL_KEY_VALUE(module_id=%d, rnti=%x, enb_flag=%d, rab_id=%d, SRB_FLAG=%d)
\n
"
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
,
SRB_FLAG_NO
);
key
=
PDCP_COLL_KEY_VALUE
(
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
,
SRB_FLAG_NO
);
h_rc
=
hashtable_get
(
pdcp_coll_p
,
key
,
(
void
**
)
&
pdcp_p
);
LOG_
I
(
PDCP
,
"request key %x : (%d,%x,%d,%d)
\n
"
,
LOG_
D
(
PDCP
,
"request key %x : (%d,%x,%d,%d)
\n
"
,
key
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
);
}
...
...
@@ -907,7 +907,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
}
else
{
// enb_flag
if
(
rab_id
!=
0
)
{
if
(
rab_id
==
UE_IP_DEFAULT_RAB_ID
)
{
LOG_
I
(
PDCP
,
"PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%x, enb_flag=%d)
\n
"
,
LOG_
D
(
PDCP
,
"PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%x, enb_flag=%d)
\n
"
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
);
key
=
PDCP_COLL_KEY_DEFAULT_DRB_VALUE
(
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
);
h_rc
=
hashtable_get
(
pdcp_coll_p
,
key
,
(
void
**
)
&
pdcp_p
);
...
...
@@ -915,11 +915,11 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
key
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
);
}
else
{
rab_id
=
rab_id
%
maxDRB
;
LOG_
I
(
PDCP
,
"PDCP_COLL_KEY_VALUE(module_id=%d, rnti=%x, enb_flag=%d, rab_id=%d, SRB_FLAG=%d)
\n
"
,
LOG_
D
(
PDCP
,
"PDCP_COLL_KEY_VALUE(module_id=%d, rnti=%x, enb_flag=%d, rab_id=%d, SRB_FLAG=%d)
\n
"
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
,
SRB_FLAG_NO
);
key
=
PDCP_COLL_KEY_VALUE
(
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
,
SRB_FLAG_NO
);
h_rc
=
hashtable_get
(
pdcp_coll_p
,
key
,
(
void
**
)
&
pdcp_p
);
LOG_
I
(
PDCP
,
"request key %x : (%d,%x,%d,%d)
\n
"
,
LOG_
D
(
PDCP
,
"request key %x : (%d,%x,%d,%d)
\n
"
,
key
,
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
);
}
...
...
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
View file @
780b5601
...
...
@@ -845,7 +845,7 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
PROTOCOL_RLC_AM_MSC_ARGS
(
ctxt_pP
,
rlc_pP
),
rlc_p
->
buffer_occupancy
);
}
#else
LOG_
W
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" BO %d , NB SDU %d
\n
"
,
LOG_
D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" BO %d , NB SDU %d
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
rlc_p
->
buffer_occupancy
,
rlc_p
->
input_sdus
.
nb_elements
);
...
...
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