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
34a94281
Commit
34a94281
authored
Nov 11, 2022
by
Stone WU
Committed by
jperaldi
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add optimized code and some memory leak protection for multiple RRC configuration request
parent
bdb4f0a8
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
252 additions
and
152 deletions
+252
-152
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+3
-3
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+22
-22
openair2/PHY_INTERFACE/IF_Module.c
openair2/PHY_INTERFACE/IF_Module.c
+1
-1
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+152
-59
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+68
-60
openair2/RRC/LTE/rrc_proto.h
openair2/RRC/LTE/rrc_proto.h
+1
-1
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+3
-3
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+2
-3
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
34a94281
...
...
@@ -205,8 +205,9 @@ extern uint16_t slot_ahead;
void
oai_create_enb
(
void
)
{
int
bodge_counter
=
0
;
/* MultiCell: Function modify for Multiple CC */
for
(
int
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
0
]
;
CC_id
++
)
{
PHY_VARS_eNB
*
eNB
=
RC
.
eNB
[
0
][
CC_id
];
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"[VNF] RC.eNB[0][0]. Mod_id:%d CC_id:%d nb_CC[0]:%d abstraction_flag:%d single_thread_flag:%d if_inst:%p
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
,
RC
.
nb_CC
[
0
],
eNB
->
abstraction_flag
,
eNB
->
single_thread_flag
,
eNB
->
if_inst
);
...
...
@@ -214,7 +215,6 @@ void oai_create_enb(void) {
eNB
->
CC_id
=
CC_id
;
eNB
->
abstraction_flag
=
0
;
eNB
->
single_thread_flag
=
0
;
//single_thread_flag;
RC
.
nb_CC
[
CC_id
]
=
MAX_NUM_CCs
;
if
(
eNB
->
if_inst
==
0
)
{
eNB
->
if_inst
=
IF_Module_init
(
bodge_counter
);
...
...
@@ -232,7 +232,7 @@ void oai_create_enb(void) {
usleep
(
50000
);
}
while
(
eNB
->
configured
!=
1
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s() eNB
is now configured
\n
"
,
__FUNCTION__
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s() eNB
Cell %d is now configured
\n
"
,
__FUNCTION__
,
CC_id
);
}
}
...
...
openair2/LAYER2/MAC/config.c
View file @
34a94281
...
...
@@ -821,7 +821,7 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
ul_CarrierFreq
,
pbch_repetition
);
mac_init_cell_params
(
Mod_idP
,
CC_idP
);
//mac_init_cell_params(Mod_idP,CC_idP); //This would reset UE info but if UE is RRC_Connected, rnti shall not reset
if
(
schedulingInfoList
!=
NULL
)
{
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
tdd_Config
=
tdd_Config
;
...
...
@@ -976,7 +976,7 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
Mod_idP
,
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
0
],
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
1
],
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
0
]
<<
1
|
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
1
]
>>
7
);
//RC.mac[Mod_idP]->common_channels[0].non_mbsfn_SubframeConfig = (int)(nonMBSFN_SubframeConfig->subframeAllocation_r14.buf[0]<<1) | (int)(nonMBSFN_SubframeConfig->subframeAllocation_r14.buf[1]>>7);
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
non_mbsfn_SubframeConfig
=
nonMBSFN_SubframeConfig
;
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
non_mbsfn_SubframeConfig
=
nonMBSFN_SubframeConfig
;
nfapi_config_request_t
*
cfg
=
&
RC
.
mac
[
Mod_idP
]
->
config
[
CC_idP
];
cfg
->
fembms_config
.
non_mbsfn_config_flag
.
value
=
1
;
cfg
->
fembms_config
.
non_mbsfn_config_flag
.
tl
.
tag
=
NFAPI_FEMBMS_CONFIG_NON_MBSFN_FLAG_TAG
;
...
...
@@ -992,35 +992,35 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
cfg
->
num_tlv
++
;
//We need to reuse current MCH scheduler
//TOCHECK whether we can simply reuse current mbsfn_SubframeConfig stuff
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
FeMBMS_flag
=
FeMBMS_Flag
;
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
FeMBMS_flag
=
FeMBMS_Flag
;
}
if
(
mbsfn_AreaInfoList
!=
NULL
)
{
// One eNB could be part of multiple mbsfn syc area, this could change over time so reset each time
LOG_I
(
MAC
,
"[eNB %d][CONFIG] Received %d MBSFN Area Info
\n
"
,
Mod_idP
,
mbsfn_AreaInfoList
->
list
.
count
);
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
num_active_mbsfn_area
=
mbsfn_AreaInfoList
->
list
.
count
;
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
num_active_mbsfn_area
=
mbsfn_AreaInfoList
->
list
.
count
;
for
(
i
=
0
;
i
<
mbsfn_AreaInfoList
->
list
.
count
;
i
++
)
{
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
mbsfn_AreaInfo
[
i
]
=
mbsfn_AreaInfoList
->
list
.
array
[
i
];
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbsfn_AreaInfo
[
i
]
=
mbsfn_AreaInfoList
->
list
.
array
[
i
];
LOG_I
(
MAC
,
"[eNB %d][CONFIG] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld
\n
"
,
Mod_idP
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
mbsfn_AreaInfo
[
i
]
->
mcch_Config_r9
.
mcch_RepetitionPeriod_r9
);
// config_sib13(Mod_idP,0,i,RC.mac[Mod_idP]->common_channels[
0
].mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
config_sib13
(
Mod_idP
,
0
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
mbsfn_AreaInfo
[
i
]
->
mbsfn_AreaId_r9
);
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbsfn_AreaInfo
[
i
]
->
mcch_Config_r9
.
mcch_RepetitionPeriod_r9
);
// config_sib13(Mod_idP,0,i,RC.mac[Mod_idP]->common_channels[
CC_idP
].mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
config_sib13
(
Mod_idP
,
0
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbsfn_AreaInfo
[
i
]
->
mbsfn_AreaId_r9
);
}
}
if
(
mbms_AreaConfig
!=
NULL
)
{
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_AllocPeriod_r9
=
mbms_AreaConfig
->
commonSF_AllocPeriod_r9
;
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
commonSF_AllocPeriod_r9
=
mbms_AreaConfig
->
commonSF_AllocPeriod_r9
;
LOG_I
(
MAC
,
"[eNB %d][CONFIG] LTE_MBSFNAreaConfiguration_r9_t(%p) commonSF_AllocPeriod_r9(%d)
\n
"
,
Mod_idP
,
mbms_AreaConfig
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_AllocPeriod_r9
);
for
(
i
=
0
;
i
<
mbms_AreaConfig
->
commonSF_Alloc_r9
.
list
.
count
;
i
++
){
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
=
mbms_AreaConfig
->
commonSF_Alloc_r9
.
list
.
array
[
i
];
LOG_I
(
RRC
,
"[eNB %d][CONFIG] MBSFNArea[%d] commonSF_Alloc_r9: radioframeAllocationPeriod(%ldn),radioframeAllocationOffset(%ld), subframeAllocation(%x,%x,%x)
\n
"
,
Mod_idP
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
radioframeAllocationPeriod
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
radioframeAllocationOffset
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
0
]
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
1
]
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
2
]);
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
radioframeAllocationPeriod
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
radioframeAllocationOffset
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
0
]
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
1
]
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
commonSF_Alloc_r9_mbsfn_SubframeConfig
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
2
]);
}
}
...
...
@@ -1030,29 +1030,29 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
pmch_InfoList
->
list
.
count
);
for
(
i
=
0
;
i
<
pmch_InfoList
->
list
.
count
;
i
++
)
{
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
pmch_Config
[
i
]
=
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
pmch_Config
[
i
]
=
&
pmch_InfoList
->
list
.
array
[
i
]
->
pmch_Config_r9
;
LOG_I
(
MAC
,
"[CONFIG] PMCH[%d]: This PMCH stop (sf_AllocEnd_r9) at subframe %ldth
\n
"
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
pmch_Config
[
i
]
->
sf_AllocEnd_r9
);
LOG_I
(
MAC
,
"[CONFIG] PMCH[%d]: mch_Scheduling_Period = %ld
\n
"
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
pmch_Config
[
i
]
->
mch_SchedulingPeriod_r9
);
LOG_I
(
MAC
,
"[CONFIG] PMCH[%d]: dataMCS = %ld
\n
"
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
pmch_Config
[
i
]
->
dataMCS_r9
);
// MBMS session info list in each MCH
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
mbms_SessionList
[
i
]
=
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbms_SessionList
[
i
]
=
&
pmch_InfoList
->
list
.
array
[
i
]
->
mbms_SessionInfoList_r9
;
LOG_I
(
MAC
,
"PMCH[%d] Number of session (MTCH) is: %d
\n
"
,
i
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbms_SessionList
[
i
]
->
list
.
count
);
for
(
int
ii
=
0
;
ii
<
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
mbms_SessionList
[
i
]
->
list
.
count
;
ii
++
){
for
(
int
ii
=
0
;
ii
<
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbms_SessionList
[
i
]
->
list
.
count
;
ii
++
){
LOG_I
(
MAC
,
"PMCH[%d] MBMS Session[%d] is: %lu
\n
"
,
i
,
ii
,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
0
].
mbms_SessionList
[
i
]
->
list
.
array
[
ii
]
->
logicalChannelIdentity_r9
);
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mbms_SessionList
[
i
]
->
list
.
array
[
ii
]
->
logicalChannelIdentity_r9
);
}
}
}
...
...
openair2/PHY_INTERFACE/IF_Module.c
View file @
34a94281
...
...
@@ -722,7 +722,7 @@ void UL_indication(UL_IND_t *UL_info, void *proc) {
if
(
NFAPI_MODE
!=
NFAPI_MODE_PNF
)
{
/* MultiCell: Condition modified for Multiple CC */
if
(
(
ifi
->
CC_mask
==
0
)
||
(
ifi
->
CC_mask
==
1
)
||
(
ifi
->
CC_mask
==
2
)
||
(
ifi
->
CC_mask
==
3
))
{
if
(
ifi
->
CC_mask
<
((
1
<<
MAX_NUM_CCs
)
-
1
))
{
ifi
->
current_frame
=
UL_info
->
frame
;
ifi
->
current_subframe
=
UL_info
->
subframe
;
}
else
{
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
34a94281
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
34a94281
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_proto.h
View file @
34a94281
...
...
@@ -671,7 +671,7 @@ long binary_search_int(int elements[], long numElem, int value);
long
binary_search_float
(
float
elements
[],
long
numElem
,
float
value
);
void
openair_rrc_top_init_eNB
(
int
eMBMS_active
,
uint8_t
HO_active
);
void
openair_rrc_top_init_eNB
(
int
CC_id
,
int
eMBMS_active
,
uint8_t
HO_active
);
void
openair_rrc_top_init_ue
(
int
eMBMS_active
,
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
34a94281
...
...
@@ -486,6 +486,9 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
RRC_CONFIGURATION_REQ
(
msg_p
).
intraFreqReselection
[
cell_index
]
=
SIB1_CELL_ACCESS_REL_INFO
.
intraFreqReselection
;
}
}
//store the modified cell config back
memcpy
(
&
(
RC
.
rrc
[
enb_id
]
->
configuration
),
&
RRC_CONFIGURATION_REQ
(
msg_p
),
sizeof
(
RRC_CONFIGURATION_REQ
(
msg_p
)));
/* Active Parameters: only process ActiveParam when basic info availabe to avoid sending too many RRC_CONFIGURATION_REQ to RRC */
if
(
AddOrReconfigure
->
Active
.
d
==
true
)
{
...
...
@@ -522,10 +525,7 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParamPresent
[
cell_index
]
=
false
;
}
LOG_A
(
ENB_APP
,
"SS: ActiveParamPresent: %d, RlcPduCCCH_Present: %d, RLC Container PDU size: %d
\n
"
,
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParamPresent
[
cell_index
],
RRC_CONFIGURATION_REQ
(
msg_p
).
RlcPduCCCH_Present
[
cell_index
],
RRC_CONFIGURATION_REQ
(
msg_p
).
RlcPduCCCH_Size
[
cell_index
]);
//store the modified cell config back
memcpy
(
&
(
RC
.
rrc
[
enb_id
]
->
configuration
),
&
RRC_CONFIGURATION_REQ
(
msg_p
),
sizeof
(
RRC_CONFIGURATION_REQ
(
msg_p
)));
LOG_A
(
ENB_SS
,
"Sending Cell configuration to RRC from SYSTEM_CTRL_REQ
\n
"
);
itti_send_msg_to_task
(
TASK_RRC_ENB
,
ENB_MODULE_ID_TO_INSTANCE
(
enb_id
),
msg_p
);
...
...
targets/RT/USER/lte-enb.c
View file @
34a94281
...
...
@@ -488,9 +488,8 @@ static void *L1_thread( void *param ) {
if
(
oai_exit
)
break
;
/* MultiCell: Condition modified for MultiCell case */
if
((
eNB
->
CC_id
==
0
)
||
(
eNB
->
CC_id
==
1
))
{
if
(
rxtx
(
eNB
,
proc
,
thread_name
)
<
0
)
break
;
}
/* This thread can only be wakeup for one cell SUBFRAME Ind under VNF as proxy would only send one SUBFRAME Ind for all cells. */
if
(
rxtx
(
eNB
,
proc
,
thread_name
)
<
0
)
break
;
LOG_D
(
PHY
,
"L1 RX %d.%d done
\n
"
,
proc
->
frame_rx
,
proc
->
subframe_rx
);
...
...
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