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
zzha zzha
OpenXG-RAN
Commits
d7e072a4
Commit
d7e072a4
authored
Jun 10, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MAC tracing in the code
parent
41649182
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+9
-0
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+18
-1
No files found.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
d7e072a4
...
@@ -833,6 +833,9 @@ schedule_ue_spec(
...
@@ -833,6 +833,9 @@ schedule_ue_spec(
DCCH
,
DCCH
,
(
char
*
)
&
dlsch_buffer
[
sdu_lengths
[
0
]]);
(
char
*
)
&
dlsch_buffer
[
sdu_lengths
[
0
]]);
T
(
T_ENB_MAC_UE_DL_SDU
,
T_INT
(
module_idP
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
harq_pid
),
T_INT
(
DCCH
),
T_INT
(
sdu_lengths
[
0
]));
LOG_D
(
MAC
,
"[eNB %d][DCCH] CC_id %d Got %d bytes from RLC
\n
"
,
module_idP
,
CC_id
,
sdu_lengths
[
0
]);
LOG_D
(
MAC
,
"[eNB %d][DCCH] CC_id %d Got %d bytes from RLC
\n
"
,
module_idP
,
CC_id
,
sdu_lengths
[
0
]);
sdu_length_total
=
sdu_lengths
[
0
];
sdu_length_total
=
sdu_lengths
[
0
];
sdu_lcids
[
0
]
=
DCCH
;
sdu_lcids
[
0
]
=
DCCH
;
...
@@ -880,6 +883,9 @@ schedule_ue_spec(
...
@@ -880,6 +883,9 @@ schedule_ue_spec(
DCCH
+
1
,
DCCH
+
1
,
(
char
*
)
&
dlsch_buffer
[
sdu_lengths
[
0
]]);
(
char
*
)
&
dlsch_buffer
[
sdu_lengths
[
0
]]);
T
(
T_ENB_MAC_UE_DL_SDU
,
T_INT
(
module_idP
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
harq_pid
),
T_INT
(
DCCH
+
1
),
T_INT
(
sdu_lengths
[
num_sdus
]));
sdu_lcids
[
num_sdus
]
=
DCCH1
;
sdu_lcids
[
num_sdus
]
=
DCCH1
;
sdu_length_total
+=
sdu_lengths
[
num_sdus
];
sdu_length_total
+=
sdu_lengths
[
num_sdus
];
header_len_dcch
+=
2
;
header_len_dcch
+=
2
;
...
@@ -924,6 +930,9 @@ schedule_ue_spec(
...
@@ -924,6 +930,9 @@ schedule_ue_spec(
DTCH
,
DTCH
,
(
char
*
)
&
dlsch_buffer
[
sdu_length_total
]);
(
char
*
)
&
dlsch_buffer
[
sdu_length_total
]);
T
(
T_ENB_MAC_UE_DL_SDU
,
T_INT
(
module_idP
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
harq_pid
),
T_INT
(
DTCH
),
T_INT
(
sdu_lengths
[
num_sdus
]));
LOG_D
(
MAC
,
"[eNB %d][USER-PLANE DEFAULT DRB] CC_id %d Got %d bytes for DTCH %d
\n
"
,
LOG_D
(
MAC
,
"[eNB %d][USER-PLANE DEFAULT DRB] CC_id %d Got %d bytes for DTCH %d
\n
"
,
module_idP
,
CC_id
,
sdu_lengths
[
num_sdus
],
DTCH
);
module_idP
,
CC_id
,
sdu_lengths
[
num_sdus
],
DTCH
);
sdu_lcids
[
num_sdus
]
=
DTCH
;
sdu_lcids
[
num_sdus
]
=
DTCH
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
d7e072a4
...
@@ -108,12 +108,18 @@ void rx_sdu(
...
@@ -108,12 +108,18 @@ void rx_sdu(
payload_ptr
=
parse_ulsch_header
(
sduP
,
&
num_ce
,
&
num_sdu
,
rx_ces
,
rx_lcids
,
rx_lengths
,
sdu_lenP
);
payload_ptr
=
parse_ulsch_header
(
sduP
,
&
num_ce
,
&
num_sdu
,
rx_ces
,
rx_lcids
,
rx_lengths
,
sdu_lenP
);
T
(
T_ENB_MAC_UE_UL_PDU
,
T_INT
(
enb_mod_idP
),
T_INT
(
CC_idP
),
T_INT
(
rntiP
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
harq_pidP
),
T_INT
(
sdu_lenP
),
T_INT
(
num_ce
),
T_INT
(
num_sdu
));
eNB
->
eNB_stats
[
CC_idP
].
ulsch_bytes_rx
=
sdu_lenP
;
eNB
->
eNB_stats
[
CC_idP
].
ulsch_bytes_rx
=
sdu_lenP
;
eNB
->
eNB_stats
[
CC_idP
].
total_ulsch_bytes_rx
+=
sdu_lenP
;
eNB
->
eNB_stats
[
CC_idP
].
total_ulsch_bytes_rx
+=
sdu_lenP
;
eNB
->
eNB_stats
[
CC_idP
].
total_ulsch_pdus_rx
+=
1
;
eNB
->
eNB_stats
[
CC_idP
].
total_ulsch_pdus_rx
+=
1
;
// control element
// control element
for
(
i
=
0
;
i
<
num_ce
;
i
++
)
{
for
(
i
=
0
;
i
<
num_ce
;
i
++
)
{
T
(
T_ENB_MAC_UE_UL_CE
,
T_INT
(
enb_mod_idP
),
T_INT
(
CC_idP
),
T_INT
(
rntiP
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
rx_ces
[
i
]));
switch
(
rx_ces
[
i
])
{
// implement and process BSR + CRNTI +
switch
(
rx_ces
[
i
])
{
// implement and process BSR + CRNTI +
case
POWER_HEADROOM
:
case
POWER_HEADROOM
:
if
(
UE_id
!=
-
1
)
{
if
(
UE_id
!=
-
1
)
{
...
@@ -227,6 +233,9 @@ void rx_sdu(
...
@@ -227,6 +233,9 @@ void rx_sdu(
for
(
i
=
0
;
i
<
num_sdu
;
i
++
)
{
for
(
i
=
0
;
i
<
num_sdu
;
i
++
)
{
LOG_D
(
MAC
,
"SDU Number %d MAC Subheader SDU_LCID %d, length %d
\n
"
,
i
,
rx_lcids
[
i
],
rx_lengths
[
i
]);
LOG_D
(
MAC
,
"SDU Number %d MAC Subheader SDU_LCID %d, length %d
\n
"
,
i
,
rx_lcids
[
i
],
rx_lengths
[
i
]);
T
(
T_ENB_MAC_UE_UL_SDU
,
T_INT
(
enb_mod_idP
),
T_INT
(
CC_idP
),
T_INT
(
rntiP
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
rx_lcids
[
i
]),
T_INT
(
rx_lengths
[
i
]));
switch
(
rx_lcids
[
i
])
{
switch
(
rx_lcids
[
i
])
{
case
CCCH
:
case
CCCH
:
LOG_I
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, Received CCCH: %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x
\n
"
,
LOG_I
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, Received CCCH: %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x
\n
"
,
...
@@ -846,6 +855,10 @@ void schedule_ulsch_rnti(module_id_t module_idP,
...
@@ -846,6 +855,10 @@ void schedule_ulsch_rnti(module_id_t module_idP,
//store for possible retransmission
//store for possible retransmission
UE_template
->
nb_rb_ul
[
harq_pid
]
=
rb_table
[
rb_table_index
];
UE_template
->
nb_rb_ul
[
harq_pid
]
=
rb_table
[
rb_table_index
];
T
(
T_ENB_MAC_UE_UL_SCHEDULE
,
T_INT
(
module_idP
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
harq_pid
),
T_INT
(
mcs
),
T_INT
(
first_rb
[
CC_id
]),
T_INT
(
rb_table
[
rb_table_index
]),
T_INT
(
TBS
));
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)
\n
"
,
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)
\n
"
,
module_idP
,
harq_pid
,
rnti
,
CC_id
,
frameP
,
subframeP
,
UE_id
,
mcs
,
module_idP
,
harq_pid
,
rnti
,
CC_id
,
frameP
,
subframeP
,
UE_id
,
mcs
,
first_rb
[
CC_id
],
rb_table
[
rb_table_index
],
first_rb
[
CC_id
],
rb_table
[
rb_table_index
],
...
@@ -866,6 +879,10 @@ void schedule_ulsch_rnti(module_id_t module_idP,
...
@@ -866,6 +879,10 @@ void schedule_ulsch_rnti(module_id_t module_idP,
}
}
T
(
T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION
,
T_INT
(
module_idP
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T_INT
(
frameP
),
T_INT
(
subframeP
),
T_INT
(
harq_pid
),
T_INT
(
mcs
),
T_INT
(
first_rb
[
CC_id
]),
T_INT
(
rb_table
[
rb_table_index
]),
T_INT
(
round
));
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, harq_pid %d, round %d)
\n
"
,
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, harq_pid %d, round %d)
\n
"
,
module_idP
,
UE_id
,
rnti
,
CC_id
,
frameP
,
subframeP
,
mcs
,
module_idP
,
UE_id
,
rnti
,
CC_id
,
frameP
,
subframeP
,
mcs
,
first_rb
[
CC_id
],
UE_template
->
nb_rb_ul
[
harq_pid
],
first_rb
[
CC_id
],
UE_template
->
nb_rb_ul
[
harq_pid
],
...
...
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