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
7bf13bbc
Commit
7bf13bbc
authored
Apr 07, 2017
by
shahab SHARIATBAGHERI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wanring Preventing remote-sch
parent
82bbb144
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
26 deletions
+16
-26
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+5
-5
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h
...air2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h
+3
-3
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
...air2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
+1
-1
openair2/ENB_APP/flexran_agent_common.h
openair2/ENB_APP/flexran_agent_common.h
+1
-1
openair2/ENB_APP/flexran_agent_handler.c
openair2/ENB_APP/flexran_agent_handler.c
+2
-2
openair2/ENB_APP/flexran_agent_ran_api.c
openair2/ENB_APP/flexran_agent_ran_api.c
+3
-13
openair2/ENB_APP/flexran_agent_ran_api.h
openair2/ENB_APP/flexran_agent_ran_api.h
+1
-1
No files found.
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
View file @
7bf13bbc
...
...
@@ -115,11 +115,11 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
protocol__flex_rlc_bsr__init
(
rlc_reports
[
j
]);
rlc_reports
[
j
]
->
lc_id
=
j
+
1
;
rlc_reports
[
j
]
->
has_lc_id
=
1
;
rlc_reports
[
j
]
->
tx_queue_size
=
flexran_get_tx_queue_size
(
enb_id
,
i
,
j
+
1
,
"bytes_buffer"
);
rlc_reports
[
j
]
->
tx_queue_size
=
flexran_get_tx_queue_size
(
enb_id
,
i
,
j
+
1
);
rlc_reports
[
j
]
->
has_tx_queue_size
=
1
;
//TODO:Set tx queue head of line delay in ms
rlc_reports
[
j
]
->
tx_queue_hol_delay
=
flexran_get_
tx_queue_size
(
enb_id
,
i
,
j
+
1
,
"head_line"
);
rlc_reports
[
j
]
->
tx_queue_hol_delay
=
flexran_get_
hol_delay
(
enb_id
,
i
,
j
+
1
);
rlc_reports
[
j
]
->
has_tx_queue_hol_delay
=
1
;
//TODO:Set retransmission queue size in bytes
rlc_reports
[
j
]
->
retransmission_queue_size
=
10
;
...
...
@@ -128,7 +128,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
rlc_reports
[
j
]
->
retransmission_queue_hol_delay
=
100
;
rlc_reports
[
j
]
->
has_retransmission_queue_hol_delay
=
0
;
//TODO DONE:Set current size of the pending message in bytes
rlc_reports
[
j
]
->
status_pdu_size
=
flexran_get_
hol_delay
(
enb_id
,
i
,
j
+
1
);
rlc_reports
[
j
]
->
status_pdu_size
=
flexran_get_
tx_queue_size
(
enb_id
,
i
,
j
+
1
);
rlc_reports
[
j
]
->
has_status_pdu_size
=
1
;
}
...
...
@@ -1174,8 +1174,8 @@ int flexran_agent_register_mac_xface(mid_t mod_id, AGENT_MAC_xface *xface) {
xface
->
flexran_agent_send_sr_info
=
flexran_agent_send_sr_info
;
xface
->
flexran_agent_send_sf_trigger
=
flexran_agent_send_sf_trigger
;
//xface->flexran_agent_send_update_mac_stats = flexran_agent_send_update_mac_stats;
xface
->
flexran_agent_schedule_ue_spec
=
flexran_schedule_ue_spec_default
;
//
xface->flexran_agent_schedule_ue_spec = flexran_schedule_ue_spec_remote;
//
xface->flexran_agent_schedule_ue_spec = flexran_schedule_ue_spec_default;
xface
->
flexran_agent_schedule_ue_spec
=
flexran_schedule_ue_spec_remote
;
xface
->
flexran_agent_get_pending_dl_mac_config
=
flexran_agent_get_pending_dl_mac_config
;
xface
->
dl_scheduler_loaded_lib
=
NULL
;
...
...
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h
View file @
7bf13bbc
...
...
@@ -48,7 +48,7 @@ typedef struct {
/// Send to the controller all the mac stat updates that occured during this subframe
/// based on the stats request configuration
void
(
*
flexran_agent_send_update_mac_stats
)(
mid_t
mod_id
);
//
void (*flexran_agent_send_update_mac_stats)(mid_t mod_id);
/// Provide to the scheduler a pending dl_mac_config message
void
(
*
flexran_agent_get_pending_dl_mac_config
)(
mid_t
mod_id
,
...
...
@@ -63,8 +63,8 @@ typedef struct {
/// Notify the controller for a state change of a particular UE, by sending the proper
/// UE state change message (ACTIVATION, DEACTIVATION, HANDOVER)
int
(
*
flexran_agent_notify_ue_state_change
)(
mid_t
mod_id
,
uint32_t
rnti
,
uint8_t
state_change
);
//
int (*flexran_agent_notify_ue_state_change)(mid_t mod_id, uint32_t rnti,
//
uint8_t state_change);
void
*
dl_scheduler_loaded_lib
;
...
...
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
View file @
7bf13bbc
...
...
@@ -54,7 +54,7 @@ typedef struct {
/// Notify the controller for a state change of a particular UE, by sending the proper
/// UE state change message (ACTIVATION, DEACTIVATION, HANDOVER)
void
(
*
flexran_agent_notify_ue_state_change
)(
mid_t
mod_id
,
uint32_t
rnti
,
int
(
*
flexran_agent_notify_ue_state_change
)(
mid_t
mod_id
,
uint32_t
rnti
,
uint32_t
state_change
);
void
(
*
flexran_trigger_rrc_measurements
)(
mid_t
mod_id
,
MeasResults_t
*
measResults
);
...
...
openair2/ENB_APP/flexran_agent_common.h
View file @
7bf13bbc
...
...
@@ -166,6 +166,6 @@ err_code_t flexran_agent_init_cont_stats_update(mid_t mod_id);
void
flexran_agent_send_update_stats
(
mid_t
mod_id
);
err_code_t
flexran_agent_enable_cont_stats_update
(
mid_t
mod_id
,
xid_t
xid
,
stats_request_config_t
*
stats_req
)
;
err_code_t
flexran_agent_disable_cont_stats_update
(
mid_t
mod_id
);
#endif
openair2/ENB_APP/flexran_agent_handler.c
View file @
7bf13bbc
...
...
@@ -97,7 +97,7 @@ Protocol__FlexranMessage* flexran_agent_handle_message (mid_t mod_id,
err_code
=
PROTOCOL__FLEXRAN_ERR__MSG_DECODING
;
goto
error
;
}
//printf("==================> %d %d \n", decoded_message->msg_case, decoded_message->msg_dir);
//
printf("==================> %d %d \n", decoded_message->msg_case, decoded_message->msg_dir);
if
((
decoded_message
->
msg_case
>
sizeof
(
agent_messages_callback
)
/
(
3
*
sizeof
(
flexran_agent_message_decoded_callback
)))
||
(
decoded_message
->
msg_dir
>
PROTOCOL__FLEXRAN_DIRECTION__UNSUCCESSFUL_OUTCOME
)){
err_code
=
PROTOCOL__FLEXRAN_ERR__MSG_NOT_HANDLED
;
...
...
@@ -309,7 +309,7 @@ int flexran_agent_handle_stats(mid_t mod_id, const void *params, Protocol__Flexr
}
else
if
(
comp_req
->
report_frequency
==
PROTOCOL__FLEX_STATS_REPORT_FREQ__FLSRF_CONTINUOUS
)
{
/*If request was for continuous updates, disable the previous configuration and
set up a new one*/
//
flexran_agent_disable_cont_stats_update(mod_id);
flexran_agent_disable_cont_stats_update
(
mod_id
);
stats_request_config_t
request_config
;
request_config
.
report_type
=
PROTOCOL__FLEX_STATS_TYPE__FLST_COMPLETE_STATS
;
request_config
.
report_frequency
=
PROTOCOL__FLEX_STATS_REPORT_FREQ__FLSRF_ONCE
;
...
...
openair2/ENB_APP/flexran_agent_ran_api.c
View file @
7bf13bbc
...
...
@@ -152,21 +152,11 @@ int flexran_get_ue_wcqi (mid_t mod_id, mid_t ue_id) {
// return ((UE_list_t *)enb_ue[mod_id])->eNB_UE_stats[UE_PCCID(mod_id,ue_id)][ue_id].dl_cqi;
}
int
flexran_get_tx_queue_size
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
,
char
*
buffer_status
)
{
int
flexran_get_tx_queue_size
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
)
{
rnti_t
rnti
=
flexran_get_ue_crnti
(
mod_id
,
ue_id
);
uint16_t
frame
=
(
uint16_t
)
flexran_get_current_frame
(
mod_id
);
mac_rlc_status_resp_t
rlc_status
=
mac_rlc_status_ind
(
mod_id
,
rnti
,
mod_id
,
frame
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
channel_id
,
0
);
if
(
strcmp
(
buffer_status
,
"bytes_buffer"
)){
mac_rlc_status_resp_t
rlc_status
=
mac_rlc_status_ind
(
mod_id
,
rnti
,
mod_id
,
frame
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
channel_id
,
0
);
return
rlc_status
.
bytes_in_buffer
;
}
else
if
(
strcmp
(
buffer_status
,
"pdu_buffer"
))
{
return
rlc_status
.
pdus_in_buffer
;
}
/* else if (strcmp(buffer_status, "head_line")){ */
/* return rlc_status.head_sdu_remaining_size_to_send; */
/* } */
}
int
flexran_get_hol_delay
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
)
{
...
...
openair2/ENB_APP/flexran_agent_ran_api.h
View file @
7bf13bbc
...
...
@@ -89,7 +89,7 @@ int flexran_get_ue_phr (mid_t mod_id, mid_t ue_id);
int
flexran_get_ue_wcqi
(
mid_t
mod_id
,
mid_t
ue_id
);
/* Get the transmission queue size for a UE with a channel_id logical channel id */
int
flexran_get_tx_queue_size
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
,
char
*
buffer_status
);
int
flexran_get_tx_queue_size
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
);
/* Get the head of line delay for a UE with a channel_id logical channel id */
int
flexran_get_hol_delay
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
);
...
...
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