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
Michael Black
OpenXG-RAN
Commits
60a3af3e
Commit
60a3af3e
authored
Jan 21, 2016
by
aikaterini.trilyraki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perpetual scheduling turned on / extra logging in CCE allocation
parent
d6547c80
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+10
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+1
-1
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+4
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
60a3af3e
...
...
@@ -997,7 +997,7 @@ int allocate_CCEs(int module_idP,
DCI_PDU
*
DCI_pdu
=
&
eNB_mac_inst
[
module_idP
].
common_channels
[
CC_idP
].
DCI_pdu
;
int
nCCE_max
=
mac_xface
->
get_nCCE_max
(
module_idP
,
CC_idP
,
DCI_pdu
->
num_pdcch_symbols
,
subframeP
);
int
fCCE
;
int
i
;
int
i
,
j
;
int
allocation_is_feasible
=
1
;
DCI_ALLOC_t
*
dci_alloc
;
...
...
@@ -1046,7 +1046,15 @@ int allocate_CCEs(int module_idP,
allocation_is_feasible
=
0
;
LOG_I
(
MAC
,
"subframe %d: Dropping Allocation for RNTI %x
\n
"
,
subframeP
,
dci_alloc
->
rnti
);
for
(
j
=
0
;
j
<=
i
;
j
++
){
LOG_I
(
MAC
,
"DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)
\n
"
,
i
,
DCI_pdu
->
Num_common_dci
+
DCI_pdu
->
Num_ue_spec_dci
,
DCI_pdu
->
Num_common_dci
,
DCI_pdu
->
Num_ue_spec_dci
,
DCI_pdu
->
dci_alloc
[
j
].
rnti
,
DCI_pdu
->
dci_alloc
[
j
].
format
,
1
<<
DCI_pdu
->
dci_alloc
[
j
].
L
,
DCI_pdu
->
nCCE
,
nCCE_max
,
DCI_pdu
->
num_pdcch_symbols
);
}
}
else
{
DCI_pdu
->
num_pdcch_symbols
++
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
60a3af3e
...
...
@@ -760,7 +760,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
LOG_T
(
MAC
,
"[eNB %d] Frame %d, subframeP %d, UE %d CC %d : got harq pid %d round %d (rnti %x,mode %s)
\n
"
,
module_idP
,
frameP
,
subframeP
,
UE_id
,
CC_id
,
harq_pid
,
round
,
rnti
,
mode_string
[
eNB_UE_stats
->
mode
]);
#undef EXMIMO_IOT
//
#undef EXMIMO_IOT
#ifndef EXMIMO_IOT
if
(((
UE_is_to_be_scheduled
(
module_idP
,
CC_id
,
UE_id
)
>
0
))
||
(
round
>
0
)
||
((
frameP
%
10
)
==
0
))
...
...
openair2/RRC/LITE/rrc_eNB.c
View file @
60a3af3e
...
...
@@ -3700,7 +3700,8 @@ rrc_eNB_decode_ccch(
* the current one must be removed from MAC/PHY (zombie UE)
*/
if
((
ue_context_p
=
rrc_eNB_ue_context_random_exist
(
ctxt_pP
,
random_value
)))
{
AssertFatal
(
0
==
1
,
"TODO: remove UE from MAC/PHY (how?)"
);
#warning "TODO: random_exist: remove UE from MAC/PHY (how?)"
// AssertFatal(0 == 1, "TODO: remove UE from MAC/PHY (how?)");
ue_context_p
=
NULL
;
}
else
{
ue_context_p
=
rrc_eNB_get_next_free_ue_context
(
ctxt_pP
,
random_value
);
...
...
@@ -3712,7 +3713,8 @@ rrc_eNB_decode_ccch(
m_tmsi_t
m_tmsi
=
BIT_STRING_to_uint32
(
&
s_TMSI
.
m_TMSI
);
random_value
=
(((
uint64_t
)
mme_code
)
<<
32
)
|
m_tmsi
;
if
((
ue_context_p
=
rrc_eNB_ue_context_stmsi_exist
(
ctxt_pP
,
mme_code
,
m_tmsi
)))
{
AssertFatal
(
0
==
1
,
"TODO: remove UE from MAC/PHY (how?)"
);
#warning "TODO: stmsi_exist: remove UE from MAC/PHY (how?)"
// AssertFatal(0 == 1, "TODO: remove UE from MAC/PHY (how?)");
ue_context_p
=
NULL
;
}
else
{
ue_context_p
=
rrc_eNB_get_next_free_ue_context
(
ctxt_pP
,
NOT_A_RANDOM_UE_IDENTITY
);
...
...
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